From 986f2348f39deaf8d93ec5e704f6a583620bacad Mon Sep 17 00:00:00 2001 From: teamsandpaper Date: Fri, 25 Nov 2022 16:15:05 +0100 Subject: [PATCH] v0.1.3 --- .github/workflows/desktop_build_release.yml | 2 +- dekstop_frontend/package.json | 2 +- docker-compose.yml | 4 ---- 3 files changed, 2 insertions(+), 6 deletions(-) diff --git a/.github/workflows/desktop_build_release.yml b/.github/workflows/desktop_build_release.yml index 67454541..4a78fc0e 100644 --- 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 index 79a0f5d3..7b29ef4d 100644 --- 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 index bbea7cd9..b9a29c86 100644 --- 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