From d7207f7c2a034ae09fe90d85eba8f8c00af6cd62 Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Thu, 19 Dec 2013 16:09:33 +1100
Subject: [PATCH] Fixes some merge issues

---
 .../umbraco/controls/GenericProperties/GenericProperty.ascx   | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/Umbraco.Web.UI/umbraco/controls/GenericProperties/GenericProperty.ascx b/src/Umbraco.Web.UI/umbraco/controls/GenericProperties/GenericProperty.ascx
index 6bce6fb2e2..a89a33f855 100644
--- a/src/Umbraco.Web.UI/umbraco/controls/GenericProperties/GenericProperty.ascx
+++ b/src/Umbraco.Web.UI/umbraco/controls/GenericProperties/GenericProperty.ascx
@@ -66,6 +66,7 @@
         </div>
     </div>
 </li>
+<script type="text/javascript">    
     function ValidateValidation(sender, args) {
         try {
             var patt = new RegExp(args.Value);
@@ -74,4 +75,5 @@
         } catch (e) {
             args.IsValid = false;
         }
-    }
\ No newline at end of file
+    }
+</script>
\ No newline at end of file