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

diff --git a/String.js b/String.js
index d30b494..122a008 100755
--- a/String.js
+++ b/String.js
@@ -9,11 +9,18 @@
  * <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;
 
 
 XObject.extend(String, 
+>>>>>>> 134619d3049edce9b27810483e8011e5dfb783e0
     {
     
         /** @scope String */