(fix) fixed merging conflicts

palladiumkenya · Dec 4, 2024 · 560b642 · 560b642
2 parents d31ebf4 + a9efe7d
commit 560b642
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 5,587 deletions.
diff --git a/package.json b/package.json
@@ -15,7 +15,7 @@
     "prettier": "prettier --config prettier.config.js --write \"packages/**/*.{ts,tsx,css,scss}\" \"e2e/**/*.ts\"",
     "start": "openmrs develop",
     "verify": "turbo run lint && turbo run typescript && turbo run test --color --concurrency=5",
-    "preinstall": "node -e \"if(process.env.npm_execpath.indexOf('yarn') === -1) throw new Error('You must use Yarn to install dependencies')\""
+    "preinstall": "npx only-allow yarn"
   },
   "resolutions": {
     "sass": "^1.54.3"

diff --git a/packages/esm-lab-manifest-app/src/forms/lab-manifest-form.scss b/packages/esm-lab-manifest-app/src/forms/lab-manifest-form.scss
@@ -40,7 +40,6 @@
   margin-top: layout.$spacing-05;
   display: flex;
   flex: 1;
-
 }
 
 .datePickersRow {
@@ -51,7 +50,6 @@
   width: 100%;
 }
 
-
 .button {
   height: layout.$spacing-10;
   display: flex;
@@ -101,7 +99,7 @@
     left: 0;
   }
 
-  &>span {
+  & > span {
     @include type.type-style('body-01');
   }
 }
@@ -133,4 +131,4 @@
 .datePickerInput input,
 .datePickerInput {
   min-width: 100%;
-}
+}