From 20a6ae8829ce71735d0d8388339c41623790f688 Mon Sep 17 00:00:00 2001 From: manisha Date: Jun 03 2021 14:07:39 +0000 Subject: [PATCH 1/9] solved conflicts --- diff --git a/.vscode/launch.json b/.vscode/launch.json new file mode 100644 index 0000000..7a9dfa0 --- /dev/null +++ b/.vscode/launch.json @@ -0,0 +1,15 @@ +{ + // Use IntelliSense to learn about possible attributes. + // Hover to view descriptions of existing attributes. + // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387 + "version": "0.2.0", + "configurations": [ + { + "type": "pwa-chrome", + "request": "launch", + "name": "Launch Chrome against localhost", + "url": "http://localhost:8080", + "webRoot": "${workspaceFolder}" + } + ] +} \ No newline at end of file diff --git a/package.json b/package.json index ddb3eec..438f2b2 100644 --- a/package.json +++ b/package.json @@ -5,7 +5,6 @@ "homepage": ".", "dependencies": { "@babel/runtime": "^7.14.0", - "bootstrap": "^4.4.1", "dateformat": "^3.0.3", "nanoid": "^3.1.22", "query-string": "^7.0.0", diff --git a/public/index.html b/public/index.html index db44964..016a790 100644 --- a/public/index.html +++ b/public/index.html @@ -23,12 +23,10 @@ Fedora QA Landingpage - + - -