Merge branch 'devel' of github.com:AECP-ETHZ/FARMIND into devel

# Conflicts: # .github/workflows/main.yml # src/main/java/farmind/agent/Farm.java
AECP-ETHZ · Aug 30, 2022 · c633f7c · c633f7c
2 parents c3fef64 + cf43aa7
commit c633f7c
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -2,9 +2,9 @@ name: CI
 
 on:
   push:
-    branches: [ master, develop ]
+    branches: [ master, devel ]
   pull_request:
-    branches: [ master, develop ]
+    branches: [ master, devel ]
   workflow_dispatch:
 
 # A workflow run is made up of one or more jobs that can run sequentially or in parallel