Merge remote-tracking branch 'origin/main'

A
e06f37762819b6bb28361a620c52db1c9d478dc · Mar 4, 2025 · 94e68c5 · 94e68c5
2 parents 475804b + 2f1175c
commit 94e68c5
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/.github/workflows/deploy_test.yml b/.github/workflows/deploy_test.yml
@@ -3,7 +3,7 @@ name: Continuous Development Deploy to TDT4242 server
 on:
   push:
     branches:
-      - develop # Or your development branch
+      - main # Or your development branch
   workflow_dispatch:
     inputs:
       config:

diff --git a/README.md b/README.md
@@ -188,7 +188,8 @@ The file .env would normally not be uploaded together with the code since that i
 
 ## An update triggering workflow
 
-Let's update this file :)
+Let's update this file :)lalalaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
 
 
 i m happpyyyyy
+