]> Shamusworld >> Repos - ardour-manual/commitdiff
fix merge conflict
authorPaul Davis <paul@linuxaudiosystems.com>
Wed, 7 May 2014 17:54:44 +0000 (13:54 -0400)
committerPaul Davis <paul@linuxaudiosystems.com>
Wed, 7 May 2014 17:54:44 +0000 (13:54 -0400)
_manual/16_automation.html

index cf4674a57c77c566d0a3a0f884e36c3b025b5702..e14a3091b982cba9e1ec57dee16c52b6d673a726 100644 (file)
@@ -4,4 +4,3 @@ title: Automation
 ---                        
 
 {% children %}
-