fix merge conflict

[ardour-manual] / _manual / 16_automation.html

diff --git a/_manual/16_automation.html b/_manual/16_automation.html
index cf4674a57c77c566d0a3a0f884e36c3b025b5702..e14a3091b982cba9e1ec57dee16c52b6d673a726 100644 (file)
--- a/_manual/16_automation.html
+++ b/_manual/16_automation.html
@@ -4,4 +4,3 @@ title: Automation
 ---                        
 
 {% children %}
-