fix(merge): resolve conflicts

valor-software · Jun 20, 2019 · 01995e4 · 01995e4
1 parent 8cccc45
commit 01995e4
Show file tree

Hide file tree

Showing 969 changed files with 50,129 additions and 24,108 deletions.
diff --git a/.angular-cli.json → .angular-cli.json.bak b/.angular-cli.json → .angular-cli.json.bak
@@ -65,11 +65,6 @@
   ],
   "addons": [],
   "packages": [],
-  "e2e": {
-    "protractor": {
-      "config": "protractor.conf.js"
-    }
-  },
   "lint": [
     {
       "project": "../tslint.json"

diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
@@ -1,6 +1,6 @@
 Before opening an issue, please search for duplicates (opened and closed)
 https://github.com/valor-software/ngx-bootstrap/issues
-There's no need to open an issue here if you want to ask general question, use [StackOverflow](https://stackoverflow.com/questions/tagged/ngx-bootstrap) or [Slack](https://ngx-slack.herokuapp.com/) instead
+There's no need to open an issue here if you want to ask general question, use [StackOverflow](https://stackoverflow.com/questions/tagged/ngx-bootstrap) or [Slack](https://join.slack.com/t/ngx-home/shared_invite/enQtNTExMTY5MzcwMTM0LWQ5M2Y4OWM0OGJjNmZiOGYyNjFlZTdlOGI1YjcxYWQ2ODhiOTY4NzhiODgwMTIzNDczODIyNWNmM2RlYWRhNTg) instead
 
 ### Bug description or feature request:
 

diff --git a/.gitignore b/.gitignore
@@ -42,3 +42,7 @@ src/**/*.js
 src/**/*.map
 scripts/**/*.js
 scripts/**/*.map
+
+schematics/src/**/*.js
+schematics/src/**/*.js.map
+schematics/src/**/*.d.ts