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

diff --git a/String.js b/String.js
index 5196351..122a008 100755
--- a/String.js
+++ b/String.js
@@ -9,10 +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 */