summaryrefslogtreecommitdiffstats
path: root/psalm.ly
diff options
context:
space:
mode:
authorThibaut Horel <thibaut.horel@gmail.com>2015-09-01 12:14:35 -0700
committerThibaut Horel <thibaut.horel@gmail.com>2015-09-01 12:14:35 -0700
commite926e6c63b5410cf68685f6f7c075d7113a675d5 (patch)
tree51b5407338f9bb0c721faae8650f7bf0fd16549b /psalm.ly
parent6c998ff0e5a5e133bfe7b5b00208501a11a5808d (diff)
downloadwedding-booklet-e926e6c63b5410cf68685f6f7c075d7113a675d5.tar.gz
Update
Diffstat (limited to 'psalm.ly')
-rw-r--r--psalm.ly1
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 |