From 6c998ff0e5a5e133bfe7b5b00208501a11a5808d Mon Sep 17 00:00:00 2001
From: Guillaume Horel <guillaume.horel@gmail.com>
Date: Tue, 1 Sep 2015 13:09:08 -0400
Subject: fausse note

---
 psalm.ly | 1 +
 1 file changed, 1 insertion(+)

diff --git a/psalm.ly b/psalm.ly
index 4e5c49f..62208e4 100644
--- a/psalm.ly
+++ b/psalm.ly
@@ -1,6 +1,7 @@
 melody = {
    \key d \minor
    \time 6/8
+<<<<<<< e3a93655b17f25c4f2bf9bd73125e86d466a5bbf
    \relative c' \repeat volta 2 {
   \partial 8 d8 |
   d8. f16 g8 a8 bes c |
-- 
cgit v1.2.3-70-g09d2