Fix merge conflicts and updated links

EdgeVerve · Mar 11, 2019 · b025260 · b025260
2 parents 0c3613e + 66c97ba
commit b025260
Show file tree

Hide file tree

Showing 488 changed files with 4,345 additions and 81,696 deletions.
diff --git a/.dockerignore b/.dockerignore
diff --git a/.eslintignore b/.eslintignore
@@ -3,4 +3,6 @@
 /node_modules/
 server/dropdb.js
 /lib/expression-language/expression-syntax-parser.js
-/test/
+/test/
+drop.js
+
diff --git a/.gitattributes b/.gitattributes
diff --git a/.gitignore b/.gitignore
@@ -39,4 +39,5 @@ out/
 .vimrc
 *.heapsnapshot
 *.zip
+package-lock.json
 /common/models/test
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
diff --git a/CONTRIBUTION.md b/CONTRIBUTION.md
diff --git a/CORPORATE_CLA.md b/CORPORATE_CLA.md
diff --git a/Coding_Guidelines.md b/Coding_Guidelines.md
diff --git a/Dockerfile b/Dockerfile
diff --git a/Dockerfile_Oracle b/Dockerfile_Oracle