diff options
| author | Joshua Diamond <josh@windowoffire.com> | 2021-02-15 20:55:54 -0500 |
|---|---|---|
| committer | Joshua Diamond <josh@windowoffire.com> | 2021-02-15 20:55:54 -0500 |
| commit | d36dbe66e1b9146df85586b46c58e51a3dbb3653 (patch) | |
| tree | f1e8f2e518e7583b7fc4162c7f06c1193844d927 /keyboards/amj40/keymaps/default/updatemerge.sh | |
| parent | b0e161e33d8ec030c6965daa57a76ec70b1a1122 (diff) | |
| parent | 3fed8bced718e24e414c0d5736554d7988235b20 (diff) | |
| download | qmk_firmware-d36dbe66e1b9146df85586b46c58e51a3dbb3653.tar.gz qmk_firmware-d36dbe66e1b9146df85586b46c58e51a3dbb3653.zip | |
Merge branch 'master' into develop
Diffstat (limited to 'keyboards/amj40/keymaps/default/updatemerge.sh')
| -rwxr-xr-x | keyboards/amj40/keymaps/default/updatemerge.sh | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/keyboards/amj40/keymaps/default/updatemerge.sh b/keyboards/amj40/keymaps/default/updatemerge.sh deleted file mode 100755 index da5457e195..0000000000 --- a/keyboards/amj40/keymaps/default/updatemerge.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/bash -git checkout amj60 # gets you on branch amj60 -git fetch origin # gets you up to date with origin -git merge origin/master |