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/TokenReader.js
[gnome.introspection-doc-generator]
/
String.js
diff --git
a/String.js
b/String.js
old mode 100755
(executable)
new mode 100644
(file)
index
122a008
..
e5e01d0
--- a/
String.js
+++ b/
String.js
@@
-9,18
+9,12
@@
* <script type="text/javascript">
*/
// usage:
* <script type="text/javascript">
*/
// usage:
-<<<<<<< HEAD
-//String = imports.String.String;
-XObject = imports.XObject.XObject;
-
-String = XObject.extend(String,
-=======
// Seed.include('String.js');
// Seed.include('String.js');
-XObject = imports.XObject.XObject;
+const XObject = imports.XObject.XObject;
+
XObject.extend(String,
XObject.extend(String,
->>>>>>> 134619d3049edce9b27810483e8011e5dfb783e0
{
/** @scope String */
{
/** @scope String */