diff options
| -rw-r--r-- | package.json | 6 | ||||
| -rw-r--r-- | tsconfig.json | 4 |
2 files changed, 1 insertions, 9 deletions
diff --git a/package.json b/package.json index aca70e2e6..e1a9cc6fb 100644 --- a/package.json +++ b/package.json @@ -112,11 +112,7 @@ "pug": "^2.0.3", "raw-loader": "^1.0.0", "react": "^16.5.2", -<<<<<<< HEAD - "react-contenteditable": "^3.2.6", -======= "react-color": "^2.17.0", ->>>>>>> 96eede5f7d1706a3f7ac6ee02a85bb3da217f467 "react-dimensions": "^1.3.1", "react-dom": "^16.7.0", "react-golden-layout": "^1.0.6", @@ -135,4 +131,4 @@ "url-loader": "^1.1.2", "uuid": "^3.3.2" } -} +}
\ No newline at end of file diff --git a/tsconfig.json b/tsconfig.json index 2989a9509..41db1d0a7 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -10,11 +10,7 @@ "lib": [ "dom", "es2015" -<<<<<<< HEAD ], -======= - ] ->>>>>>> 96eede5f7d1706a3f7ac6ee02a85bb3da217f467 }, // "exclude": [ // "node_modules", |