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

diff --git a/Date.js b/Date.js
old mode 100755
new mode 100644
index 0876355..ceb5292
--- a/Date.js
+++ b/Date.js
@@ -8,11 +8,7 @@
  * Fork - LGPL
  * <script type="text/javascript">
  */
-<<<<<<< HEAD
-// usage: Date=  imports.Date.Date;
-=======
 // usage: Seed.include('Date.js')
->>>>>>> 134619d3049edce9b27810483e8011e5dfb783e0
 
 
 String          = imports.String.String;