Fix: Fix merge conflicts

openscd · Nov 13, 2023 · 7f59cbd · 7f59cbd
1 parent b3c707d
commit 7f59cbd
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/.editorconfig b/.editorconfig
@@ -9,7 +9,7 @@ root = true
 
 # Change these settings to your own preference
 indent_style = space
-indent_size = 
+indent_size = 2
 
 # We recommend you to keep these unchanged
 end_of_line = lf

diff --git a/.github/workflows/save-pr-data-to-file.yml b/.github/workflows/save-pr-data-to-file.yml
@@ -34,4 +34,4 @@ jobs:
           name: REVIEW_DATA
           path: |
             PR_NODE_ID.txt
-            REVIEW_STATE.txt
+            REVIEW_STATE.txt
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -20,4 +20,4 @@ jobs:
         run: |
           cd packages/open-scd
           npm clean-install
-          npm run-script test
+          npm run-script test