projects
/
gnome.introspection-doc-generator
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
JSDOC/TextStream.vala
[gnome.introspection-doc-generator]
/
Date.js
diff --git
a/Date.js
b/Date.js
old mode 100755
(executable)
new mode 100644
(file)
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;