diff options
author | Pushkar Joshi | 2012-02-24 12:08:49 -0800 |
---|---|---|
committer | Pushkar Joshi | 2012-02-24 12:08:49 -0800 |
commit | 03ca7a5ed13c25faaa9100bb666e062fd15335e6 (patch) | |
tree | c51112223ceb9121cd595a60335eb2795215590f /document-templates/files/template.html | |
parent | fcb12cc09eb3cd3b42bd215877ba18f449275b75 (diff) | |
parent | 053fc63a2950c7a5ee4ebf98033b64d474a3c46e (diff) | |
download | ninja-03ca7a5ed13c25faaa9100bb666e062fd15335e6.tar.gz |
Merge branch 'pentool' into brushtool
Conflicts:
imports/codemirror/mode/scheme/scheme.js
js/tools/BrushTool.js
Diffstat (limited to 'document-templates/files/template.html')
-rw-r--r-- | document-templates/files/template.html | 18 |
1 files changed, 0 insertions, 18 deletions
diff --git a/document-templates/files/template.html b/document-templates/files/template.html deleted file mode 100644 index 974ca5ed..00000000 --- a/document-templates/files/template.html +++ /dev/null | |||
@@ -1,18 +0,0 @@ | |||
1 | <!DOCTYPE html> | ||
2 | <html lang="en"> | ||
3 | |||
4 | <head> | ||
5 | |||
6 | <meta charset="utf-8"> | ||
7 | |||
8 | <meta name="generator" content="Motorola Mobility Ninja" /> | ||
9 | |||
10 | <title>Untitled</title> | ||
11 | |||
12 | </head> | ||
13 | |||
14 | <body> | ||
15 | |||
16 | </body> | ||
17 | |||
18 | </html> \ No newline at end of file | ||