fix(conflicts): resolve conflicts

stakwork · Aug 8, 2024 · 02d8ed0 · 02d8ed0
2 parents 6e84fa2 + e609ce9
commit 02d8ed0
Show file tree

Hide file tree

Showing 144 changed files with 6,712 additions and 6,829 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -56,7 +56,7 @@ jobs:
           command: |
             export TWITTER_BEARER="Bearer ${{ secrets.TWITTER_BEARER }}"
             echo $TWITTER_BEARER
-            STAKWORK_TOKEN=daaa3a0894f0658d99781471dfccd3e1 TWITTER_BEARER=$TWITTER_BEARER GITACTION_ENV=gitactionenv docker-compose -f ./stack/alts/navfiber.yml --project-dir ./stack up -d;
+            STAKWORK_TOKEN=daaa3a0894f0658d99781471dfccd3e1 TWITTER_BEARER=$TWITTER_BEARER GITACTION_ENV=gitactionenv docker compose -f ./stack/alts/navfiber.yml --project-directory ./stack up -d;
             sleep 240;
             docker ps
             docker logs meme.sphinx
@@ -104,4 +104,4 @@ jobs:
 
       - name: Stop Stack
         working-directory: ./stack
-        run: docker-compose down
+        run: docker compose down
diff --git a/build/assets/AddContentIcon-7d47b338.js → build/assets/AddContentIcon-2a1a8619.js b/build/assets/AddContentIcon-7d47b338.js → build/assets/AddContentIcon-2a1a8619.js
diff --git a/build/assets/CheckIcon-858873e9.js b/build/assets/CheckIcon-858873e9.js
diff --git a/build/assets/ClipLoader-51c13a34.js b/build/assets/ClipLoader-51c13a34.js
diff --git a/build/assets/DailyMotion-5b81efb7.js → build/assets/DailyMotion-eb8b5677.js b/build/assets/DailyMotion-5b81efb7.js → build/assets/DailyMotion-eb8b5677.js
diff --git a/build/assets/DeleteIcon-7918c8f0.js b/build/assets/DeleteIcon-7918c8f0.js