From a5062de59a73af5ffd78a278ca82fcac8cc70f2a Mon Sep 17 00:00:00 2001 From: Jeonghyun Lee Date: Thu, 31 Oct 2024 03:34:22 +0900 Subject: [PATCH] test: workflow --- .github/workflows/sync-to-backend-repo.yml | 2 +- src/style/_variables.scss | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/sync-to-backend-repo.yml b/.github/workflows/sync-to-backend-repo.yml index 322a38523d6..fa98cf8ab39 100644 --- a/.github/workflows/sync-to-backend-repo.yml +++ b/.github/workflows/sync-to-backend-repo.yml @@ -42,7 +42,7 @@ jobs: git branch -M style/ui git fetch origin style/ui - # Merge changes and override conflicts with ours --allow-unrelated-histories + # Merge changes and override conflicts with ours git merge -X ours origin/style/ui # Push the changes to the style/ui branch diff --git a/src/style/_variables.scss b/src/style/_variables.scss index 6ab3e9d9438..3b555429cce 100644 --- a/src/style/_variables.scss +++ b/src/style/_variables.scss @@ -35,7 +35,6 @@ $mango-tango: #e97500 !default; // Swaggy-Swagger Theme -// for workflow test !! $color-primary: #2B6764 !default; $color-secondary: #877455 !default; $color-info: #4990e2 !default;