fix conflicts

libs/remix-ui/solidity-unit-testing/src/index.ts

@@ -1,2 +1,2 @@
-export * from './lib/solidity-unit-testing';
+export * from './lib/solidity-unit-testing'
 export * from './lib/logic/testTabLogic'

nx.json

@@ -145,7 +145,9 @@
     "remix-ui-tabs": {
       "tags": []
     },
-    "remix-ui-theme-module": {},
+    "remix-ui-theme-module": {
+      "tags": []
+    },
     "solidity-unit-testing": {
       "tags": []
     },

package.json

@@ -162,11 +162,7 @@
     "chokidar": "^2.1.8",
     "color-support": "^1.1.3",
     "commander": "^2.20.3",
-<<<<<<< HEAD
     "core-js": "^3.19.3",
-=======
-    "core-js": "^3.6.5",
->>>>>>> 6d78ad88e... SUT in React
     "deep-equal": "^1.0.1",
     "document-register-element": "1.13.1",
     "ethereumjs-util": "^7.0.10",

workspace.json

@@ -1179,7 +1179,6 @@
             "linter": "eslint",
             "tsConfig": ["libs/remix-ui/vertical-icons-panel/tsconfig.lib.json"],
             "exclude": ["**/node_modules/**", "!libs/remix-ui/vertical-icons-panel/**/*"]
-
           }
         }
       }