From: Alan Knowles <alan@akbkhome.com>
Date: Fri, 23 Jul 2010 04:39:55 +0000 (+0800)
Subject: Date.js
X-Git-Url: http://git.roojs.org/?p=gnome.introspection-doc-generator;a=commitdiff_plain;h=584f17e8519442d0932166895f7cc95302674205

Date.js
---

584f17e8519442d0932166895f7cc95302674205
diff --cc Date.js
index 052015f,ceb5292..0876355
--- a/Date.js
+++ b/Date.js
@@@ -8,7 -8,7 +8,11 @@@
   * Fork - LGPL
   * <script type="text/javascript">
   */
++<<<<<<< HEAD
 +// usage: Date=  imports.Date.Date;
++=======
+ // usage: Seed.include('Date.js')
++>>>>>>> 134619d3049edce9b27810483e8011e5dfb783e0
  
  
  String          = imports.String.String;
diff --cc String.js
index 5196351,d30b494..122a008
--- a/String.js
+++ b/String.js
@@@ -9,10 -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 */