1 files changed, 0 insertions, 1 deletions
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 |