'commit'

WebRoot/view/tb/form/designer.html

@@ -63,23 +63,9 @@
         var reg = new RegExp("(^|&)" + name + "=([^&]*)(&|$)", "i");
         var r = window.location.search.substr(1).match(reg);
         if (typeof (istop) != "undefined") r = top.location.search.substr(1).match(reg);
-
-            if (r != null) return unescape(r[2]);
-            return null;
-        }
-
-
-<<<<<<< HEAD
         if (r != null) return unescape(r[2]);
         return null;
     }
 </script>
-=======
-
-
-
-    </script>
-
->>>>>>> e9b2d3e86dfe83dea1477c229c7aaad77fb1636a
 </body>
 </html>