From 1763de425306f92cc6cb93c185b303b73ddae533 Mon Sep 17 00:00:00 2001
From: Paul Davis <paul@linuxaudiosystems.com>
Date: Wed, 7 May 2014 13:54:44 -0400
Subject: [PATCH] fix merge conflict

---
 _manual/16_automation.html | 1 -
 1 file changed, 1 deletion(-)

diff --git a/_manual/16_automation.html b/_manual/16_automation.html
index cf4674a..e14a309 100644
--- a/_manual/16_automation.html
+++ b/_manual/16_automation.html
@@ -4,4 +4,3 @@ title: Automation
 ---                        
 
 {% children %}
-
-- 
2.37.2