summaryrefslogtreewikicommitdiff
diff options
context:
space:
mode:
authortylermurphy534 <tylermurphy534@gmail.com>2022-10-20 00:06:41 +0000
committertylermurphy534 <tylermurphy534@gmail.com>2022-10-20 00:06:41 +0000
commit5c63f241e4568d4ce9390fefdf44d5fb98dee287 (patch)
tree77d257d85ae68af4d5fa6eca06bdc4abebc9b2e3
parentMerge pull request #81 from tylermurphy534/1.6.2 (diff)
parentupload docs (diff)
downloadkenshinshideandseek-5c63f241e4568d4ce9390fefdf44d5fb98dee287.tar.gz
kenshinshideandseek-5c63f241e4568d4ce9390fefdf44d5fb98dee287.tar.bz2
kenshinshideandseek-5c63f241e4568d4ce9390fefdf44d5fb98dee287.zip
Merge pull request 'upload docs' (#1) from dev into main
Reviewed-on: https://git.tylermurphy.net/tylermurphy534/KenshinsHideAndSeek/pulls/1
-rw-r--r--.github/workflows/beta.yml2
-rw-r--r--.github/workflows/release.yml2
-rw-r--r--CONTRIBUTING.md2
3 files changed, 3 insertions, 3 deletions
diff --git a/.github/workflows/beta.yml b/.github/workflows/beta.yml
index 80db5b7..7adde3f 100644
--- a/.github/workflows/beta.yml
+++ b/.github/workflows/beta.yml
@@ -2,7 +2,7 @@ name: Beta
on:
push:
- branches-ignore: [ master ]
+ branches-ignore: [ main ]
jobs:
build:
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 3146ab3..722d1c6 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -2,7 +2,7 @@ name: Release
on:
push:
- branches: [ master ]
+ branches: [ main ]
jobs:
build:
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 1e992d6..d02bffa 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -2,7 +2,7 @@
## Contributing Guidelines
- Do not send any pull requests to the master branch
- Any pull requests sent to master will be closed
- - Send pull requests to the current beta branch (usually named as an unreleased version)
+ - Send pull requests to the dev branch
- Please tell us why you think this change is necessary
- We don't want to spend lots of time browsing through your code changes
- Describe your changes