Merge branch 'master' of git.osdn.net:/gitroot/eos/zephyr

[eos/zephyr.git] / front-end / app / scripts / reference.ts

diff --git a/front-end/app/scripts/reference.ts b/front-end/app/scripts/reference.ts
old mode 100644 (file)
new mode 100755 (executable)
index f5815b9..a51b022
--- a/front-end/app/scripts/reference.ts
+++ b/front-end/app/scripts/reference.ts
@@ -12,11 +12,19 @@
 /// <reference path="./directives/HeaderMenu.ts" />
 /// <reference path="./directives/Option.ts" />
 /// <reference path="./directives/Directory.ts" />
+<<<<<<< HEAD
+/// <reference path="./directives/Upload.ts" />
+=======
+>>>>>>> 6b2b2b88511733893d2c6e7848c389abfcd53ba6
 
 /// <reference path="./controllers/Execution.ts" />
 /// <reference path="./controllers/Workspace.ts" />
 /// <reference path="./controllers/History.ts" />
 /// <reference path="./controllers/SelectCommand.ts" />
+<<<<<<< HEAD
+/// <reference path="./controllers/Upload.ts" />
+=======
+>>>>>>> 6b2b2b88511733893d2c6e7848c389abfcd53ba6
 /// <reference path="./controllers/Preview.ts" />
 
 /// <reference path="./filters/Tag.ts" />