Merge branch 'master' of github.com:Carreau/songbook

Conflicts: songs/Alex_Beaupain/Je_n_aime_que_toi.sg songs/Renaud/Manatthan-Kaboul.sg songs/Renaud/boucan-d-enfer.jpg
15 years ago · 2ce7938c6a
2 changed files with 1 additions and 1 deletions
--- a/Alex_Beaupain/LesChanssonsDAmours.jpg
+++ b/Alex_Beaupain/LesChanssonsDAmours.jpg
--- a/Renaud/Manatthan-Kaboul.sg
+++ b/Renaud/Manatthan-Kaboul.sg
@ -66,4 +66,4 @@
    Font toujours de nous de la chair à canon
  \endverse

-\endsong
+\endsong