Corrected issues with merge of 2.x changes

2014-08-04 19:56:58 -07:00 · 2014-08-04 19:56:58 -07:00 · 24d77f027d
parent 696e387ff3
commit 24d77f027d
6 changed files with 7 additions and 16 deletions
--- a/.gitignore
+++ b/.gitignore
@ -14,3 +14,5 @@ results

 npm-debug.log
 node_modules
+
+LoopBackExplorer.iml
--- a/LoopBackExplorer.iml
+++ b/LoopBackExplorer.iml
@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="WEB_MODULE" version="4">
-  <component name="NewModuleRootManager" inherit-compiler-output="true">
-    <exclude-output />
-    <content url="file://$MODULE_DIR$" />
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-  </component>
-</module>
-
--- a/public/lib/loadSwaggerUI.js
+++ b/public/lib/loadSwaggerUI.js
@ -61,4 +61,3 @@ $(function() {
    }
  }
 });
-