Merge branch 'main' of https://github.com/rabroldan/WaypointShopping

# Conflicts: # .github/workflows/ci.yaml
rabroldan · Dec 5, 2023 · 4381cc3 · 4381cc3
2 parents 00a3106 + bf66b1e
commit 4381cc3
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -9,5 +9,10 @@ jobs:
       - name: Checkout code
         uses: actions/checkout@v3
 
+<<<<<<< HEAD
      - name: Run ESlint
-        run: npx eslint .
+        run: npx eslint .
+=======
+      - name: Run ESlint
+        run: npx eslint .
+>>>>>>> bf66b1e1e0c7173588750d0a248a8b9549cf94b4