From 77bec56d599c49166e901719c76436071d2189e4 Mon Sep 17 00:00:00 2001
From: Eileen McNaughton <eileen@fuzion.co.nz>
Date: Tue, 13 May 2014 21:28:57 +1200
Subject: [PATCH] finish on a new line to reduce merge clashes

---
 CRM/Upgrade/Incremental/sql/4.5.alpha1.mysql.tpl | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CRM/Upgrade/Incremental/sql/4.5.alpha1.mysql.tpl b/CRM/Upgrade/Incremental/sql/4.5.alpha1.mysql.tpl
index 3068a4b48f..6316827abf 100644
--- a/CRM/Upgrade/Incremental/sql/4.5.alpha1.mysql.tpl
+++ b/CRM/Upgrade/Incremental/sql/4.5.alpha1.mysql.tpl
@@ -517,3 +517,4 @@ WHERE co.id IS NULL;
     v.name = v.name
     WHERE v.name = 'Awaiting Information';
 {/if}
+
-- 
2.25.1