X-Git-Url: http://git.roojs.org/?p=gnome.introspection-doc-generator;a=blobdiff_plain;f=Date.js;h=0876355e5d4f33566b469c7657cadf1f70a107a6;hp=052015f2ff5a7bb25a04048bc1d2cdc6118b9da6;hb=584f17e8519442d0932166895f7cc95302674205;hpb=17c4d6a264de12b91425dae49fc56abcf103e519

diff --git a/Date.js b/Date.js
index 052015f..0876355 100755
--- a/Date.js
+++ b/Date.js
@@ -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;