Please enter the commit message for your changes. Lines starting
 with '#' will be ignored, and an empty message aborts the commit.
 On branch master
 You are currently rebasing.
   (all conflicts fixed: run "git rebase --continue")

 Changes to be committed:
   (use "git reset HEAD <file>..." to unstage)

	modified:   lib/t2l-lib/music-conversion.lisp
	modified:   lib/t2l-lib/t2l-screamer.lisp