Date.js

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

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