From e926e6c63b5410cf68685f6f7c075d7113a675d5 Mon Sep 17 00:00:00 2001
From: Thibaut Horel <thibaut.horel@gmail.com>
Date: Tue, 1 Sep 2015 12:14:35 -0700
Subject: Update

---
 psalm.ly | 1 -
 1 file changed, 1 deletion(-)

(limited to 'psalm.ly')

diff --git a/psalm.ly b/psalm.ly
index 62208e4..4e5c49f 100644
--- a/psalm.ly
+++ b/psalm.ly
@@ -1,7 +1,6 @@
 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