Date.js

[gnome.introspection-doc-generator] / String.js

diff --git a/String.js b/String.js
index 5196351..122a008 100755 (executable)
--- a/String.js
+++ b/String.js
@@ -9,10 +9,18 @@
  * <script type="text/javascript">
  */
 // usage:
  * <script type="text/javascript">
  */
 // usage:

+<<<<<<< HEAD

 //String = imports.String.String; 
 XObject = imports.XObject.XObject;
 
 String = XObject.extend(String, 
 //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 */
     {
     
         /** @scope String */