chore: commit save point

washingtonpost · Jun 8, 2024 · 351a295 · 351a295
1 parent a4d523c
commit 351a295
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 10 deletions.
diff --git a/.prettierignore b/.prettierignore
@@ -8,9 +8,4 @@ node_modules
 out
 jest-coverage
 plop-templates
-/ui/theme/src/tokens.ts
-<<<<<<< Updated upstream
 /packages/kit/src/theme/tokens.ts
-=======
-ui/theme/src/tokens.ts
->>>>>>> Stashed changes
diff --git a/Makefile b/Makefile
@@ -23,11 +23,7 @@ boop-checkout:
 # create main release
 main-release:
 	make main-version
-<<<<<<< Updated upstream
 	npm run build
-=======
-	npm run turbo:build:ui:force
->>>>>>> Stashed changes
 	make boop-checkout
 	make main-publish
 	npm install

diff --git a/tsconfig.json b/tsconfig.json
@@ -1,6 +1,6 @@
 {
   "extends": "./tsconfig.base.json",
-  "exclude": ["./ui/theme/src/tokens.ts"],
+  "exclude": ["./packages/kit/src/theme/tokens.ts"],
   "compilerOptions": {
     "baseUrl": ".",
     "paths": {