resolve conflicts

SolidOS · Feb 18, 2024 · d98ef89 · d98ef89
2 parents bf2b638 + bc02cfb
commit d98ef89
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 30,842 deletions.
diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml
@@ -20,8 +20,8 @@ jobs:
     strategy:
       matrix:
         node-version: 
-          - 14.x
           - 16.x
+          - 18.x
 
     steps:
       - uses: actions/checkout@v2
-Original file line number
+Diff line change
@@ Expand Up / @@ -20,8 +20,8 @@ jobs: @@
         strategy:
           matrix:
             node-version:
-              - 14.x
               - 16.x
+              - 18.x
         steps:
           - uses: actions/checkout@v2
@@ Expand Down @@