Fixes some merge issues

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;
         }
-    }
+    }
+</script>