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

diff --git a/String.js b/String.js
index 97f065f..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 */
@@ -125,8 +133,7 @@ String = XObject.extend(String,
      * @return {String} The new value
      */
      
-XObject.extend(String.prototype, 
-    {
+XObject.extend(String.prototype,  {
         
         toggle : function(value, other){
             return this == value ? other : value;
@@ -154,6 +161,6 @@ XObject.extend(String.prototype,
             return this;
         }
  
-    };
+    
    
 });
\ No newline at end of file