fix merge conflict

2014-05-07 13:54:44 -04:00 · 2014-05-07 13:54:44 -04:00 · 1763de4253
commit 1763de4253
parent de15abf3ee
1 changed files with 0 additions and 1 deletions
--- a/_manual/16_automation.html
+++ b/_manual/16_automation.html
@ -4,4 +4,3 @@ title: Automation
 ---                        

 {% children %}
-