fix(conflicts): fixed merge conflicts

fabric8-launcher · Jun 19, 2018 · 9dcfbbf · 9dcfbbf
1 parent 6e72d2d
commit 9dcfbbf
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 232 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -75,7 +75,7 @@
     "ngx-bootstrap": "^2.0.5",
     "ngx-modal": "^0.0.29",
     "patternfly": "^3.30.1",
-    "patternfly-ng": "^3.10.1",
+    "patternfly-ng": "^3.10.1"
   },
   "peerDependencies": {
     "@angular/animations": "^4.4.6",