X-Git-Url: http://git.roojs.org/?p=gnome.introspection-doc-generator;a=blobdiff_plain;f=String.js;h=e5e01d0fea80409f7474fb46c25fa59e8bad1ea6;hp=122a008571d24f91f8209c4d40560348a9bf6499;hb=HEAD;hpb=584f17e8519442d0932166895f7cc95302674205

diff --git a/String.js b/String.js
old mode 100755
new mode 100644
index 122a008..e5e01d0
--- a/String.js
+++ b/String.js
@@ -9,18 +9,12 @@
  * <script type="text/javascript">
  */
 // usage:
-<<<<<<< HEAD
-//String = imports.String.String; 
-XObject = imports.XObject.XObject;
-
-String = XObject.extend(String, 
-=======
 // Seed.include('String.js');
-XObject = imports.XObject.XObject;
+const XObject = imports.XObject.XObject;
+
 
 
 XObject.extend(String, 
->>>>>>> 134619d3049edce9b27810483e8011e5dfb783e0
     {
     
         /** @scope String */