v0.1.3

workshopapps · Nov 25, 2022 · 986f234 · 986f234
1 parent 3d4c59c
commit 986f234
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 6 deletions.
diff --git a/.github/workflows/desktop_build_release.yml b/.github/workflows/desktop_build_release.yml
@@ -6,7 +6,7 @@ on:
 
 defaults:
   run:
-    working-directory: desktop_frontend
+    working-directory: dekstop_frontend
 
 jobs:
   release:

diff --git a/dekstop_frontend/package.json b/dekstop_frontend/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "electron_setup",
-	"version": "0.1.2",
+	"version": "0.1.3",
 	"private": true,
 	"dependencies": {
 		"@testing-library/jest-dom": "^5.16.5",

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -34,10 +34,6 @@ services:
       - '8081:8081'
     depends_on:
       - db
-<<<<<<< HEAD
-
-=======
->>>>>>> 730d1484aa0a8bada11e687aa468bcf0e34f3418
 
   db:
     image: mysql:5.7