diff options
| author | Mark Russell <mruss660@gmail.com> | 2021-09-16 16:20:39 -0400 |
|---|---|---|
| committer | Mark Russell <mruss660@gmail.com> | 2021-09-16 16:20:39 -0400 |
| commit | b9e56843a29672b2befa65bf036f6db21078291f (patch) | |
| tree | c2fa91e352127c09abd0f9b4959cd1f47d628ea8 /.github | |
| parent | cdf99b08f42c3826a8608d756bc7cda0a476ed98 (diff) | |
| parent | 3eb73774a39e255cd4b5de76441a59f1525a989c (diff) | |
resolve conflict in src/systemtask/Messages.h
Diffstat (limited to '.github')
| -rw-r--r-- | .github/workflows/main.yml | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 4744eaef..bd24359a 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -9,13 +9,13 @@ name: Build PineTime Firmware # When to run this Workflow... on: - # Run this Workflow when files are updated (Pushed) in the "master" Branch + # Run this Workflow when files are updated (Pushed) in the "master" and "develop" Branch push: - branches: [ master ] + branches: [ master, develop ] - # Also run this Workflow when a Pull Request is created or updated in the "master" Branch + # Also run this Workflow when a Pull Request is created or updated in the "master" and "develop" Branch pull_request: - branches: [ master ] + branches: [ master, develop ] # Steps to run for the Workflow jobs: |