Browse Source

Merge branch 'master' of git://lohrun.net/songbook

Conflicts:
	songs/As_De_Trefle/La_revolution.sg
	songs/As_De_Trefle/Pauvre_planete.sg
	songs/Les_Cowboys_Fringants/Hannah.sg
	songs/Thomas_Fersen/Monsieur.sg
remotes/karagrat/master
olivier desrobert 13 years ago
parent
commit
814e056a14
  1. 21
      songs/As_De_Trefle/La_revolution.sg
  2. 4
      songs/As_De_Trefle/Pauvre_planete.sg
  3. 12
      songs/Les_Cowboys_Fringants/Hannah.sg
  4. 7
      songs/Thomas_Fersen/Monsieur.sg

21
songs/As_De_Trefle/La_revolution.sg

@ -1,16 +1,9 @@
\selectlanguage{french} \selectlanguage{french}
\songcolumns{2} \songcolumns{2}
<<<<<<< HEAD
\beginsong{La révolution}[by=As de Trêfle,cov=houlala,album=Houlala]
\cover
=======
\beginsong{La révolution} \beginsong{La révolution}
[by=As de Trêfle,cov=houlala,album=Houlala] [by=As de Trêfle,cov=houlala,album=Houlala]
\cover \cover
>>>>>>> 41820107f5419d2d3759b61af492d44d8a96ed09
\gtab{B&m}{1:X02210} \gtab{B&m}{1:X02210}
\gtab{A&}{4:022100} \gtab{A&}{4:022100}
\gtab{E&m}{6:X02210} \gtab{E&m}{6:X02210}
@ -48,24 +41,14 @@
\end{verse*} \end{verse*}
\end{repeatedchords} \end{repeatedchords}
<<<<<<< HEAD
\begin{chorus}
\ifchorded
=======
\ifchorded \ifchorded
\begin{chorus} \begin{chorus}
>>>>>>> 41820107f5419d2d3759b61af492d44d8a96ed09
\musicnote[french]{Violon} \musicnote[french]{Violon}
\musicnote[english]{Violin} \musicnote[english]{Violin}
\nolyrics \[B&m A& E&m E&m] \rep{4} \nolyrics \[B&m A& E&m E&m] \rep{4}
\lilypond{La_revolution} \lilypond{La_revolution}
<<<<<<< HEAD
\fi
\end{chorus}
=======
\end{chorus} \end{chorus}
\fi \fi
>>>>>>> 41820107f5419d2d3759b61af492d44d8a96ed09
\begin{verse} \begin{verse}
\[D&]Prends-toi en main \[D&]Prends-toi en main
@ -89,8 +72,4 @@
À \[G&]rouler des galoches À \[G&]rouler des galoches
\end{verse*} \end{verse*}
\end{repeatedchords} \end{repeatedchords}
<<<<<<< HEAD
\endsong
=======
\endsong \endsong
>>>>>>> 41820107f5419d2d3759b61af492d44d8a96ed09

4
songs/As_De_Trefle/Pauvre_planete.sg

@ -1,11 +1,7 @@
\selectlanguage{french} \selectlanguage{french}
\songcolumns{2} \songcolumns{2}
<<<<<<< HEAD
\beginsong{Pauvre planète}[by=As de Trêfle,cov=houlala,album=Houlala]
=======
\beginsong{Pauvre planète} \beginsong{Pauvre planète}
[by=As de Trêfle,cov=houlala,album=Houlala] [by=As de Trêfle,cov=houlala,album=Houlala]
>>>>>>> 41820107f5419d2d3759b61af492d44d8a96ed09
\cover \cover

12
songs/Les_Cowboys_Fringants/Hannah.sg

@ -1,11 +1,7 @@
\selectlanguage{french} \selectlanguage{french}
\songcolumns{2} \songcolumns{2}
<<<<<<< HEAD
\beginsong{Hannah}[by=Les Cowboys Fringants,cov=La-grand-messe,album=La grand messe]
=======
\beginsong{Hannah} \beginsong{Hannah}
[by=Les Cowboys Fringants,cov=la-grand-messe,album=La grand messe] [by=Les Cowboys Fringants,cov=la-grand-messe,album=La grand messe]
>>>>>>> 41820107f5419d2d3759b61af492d44d8a96ed09
\cover \cover
\gtab{Am}{X02210} \gtab{Am}{X02210}
@ -15,10 +11,6 @@
\gtab{C}{X32010} \gtab{C}{X32010}
\gtab{A}{X02220} \gtab{A}{X02220}
\gtab{A7}{X02020} \gtab{A7}{X02020}
<<<<<<< HEAD
=======
>>>>>>> 41820107f5419d2d3759b61af492d44d8a96ed09
\utab{Am}{2000} \utab{Am}{2000}
\utab{Dm}{2210} \utab{Dm}{2210}
\utab{E7}{1202} \utab{E7}{1202}
@ -181,8 +173,4 @@
\end{chorus} \end{chorus}
\end{repeatedchords} \end{repeatedchords}
<<<<<<< HEAD
\endsong
=======
\endsong \endsong
>>>>>>> 41820107f5419d2d3759b61af492d44d8a96ed09

7
songs/Thomas_Fersen/Monsieur.sg

@ -17,13 +17,6 @@
\utab{Fm}{1013} \utab{Fm}{1013}
\utab{B}{2:2100} \utab{B}{2:2100}
\gtab{Cm}{0333}
\gtab{A{\shrp}}{1:2100}
\gtab{D{\shrp}}{1:2220}
\gtab{G}{0232}
\gtab{Fm}{1013}
\gtab{B}{2:2100}
\begin{verse*} \begin{verse*}
\musicnote { \Intro : \nolyrics \[Cm B Cm] \rep{2} } \musicnote { \Intro : \nolyrics \[Cm B Cm] \rep{2} }
\end{verse*} \end{verse*}

Loading…
Cancel
Save