summaryrefslogtreecommitdiff
path: root/keyboards/amj40/keymaps/myee/updatemerge.sh
diff options
context:
space:
mode:
authorpeepeetee <43021794+peepeetee@users.noreply.github.com>2022-04-20 03:19:34 +0800
committerGitHub <noreply@github.com>2022-04-20 05:19:34 +1000
commitbd8220e9fc871d7997f1565858bb7b3c77756237 (patch)
treeec07a369e9d72168c0c491e2030a4ff798a5df9d /keyboards/amj40/keymaps/myee/updatemerge.sh
parent314865f83366fbaa547540154e0d2a48e7a2e72c (diff)
move amj keyboards into amjkeyboard vendor folder (#15733)
Co-authored-by: Nick Brassel <nick@tzarc.org>
Diffstat (limited to 'keyboards/amj40/keymaps/myee/updatemerge.sh')
-rw-r--r--keyboards/amj40/keymaps/myee/updatemerge.sh4
1 files changed, 0 insertions, 4 deletions
diff --git a/keyboards/amj40/keymaps/myee/updatemerge.sh b/keyboards/amj40/keymaps/myee/updatemerge.sh
deleted file mode 100644
index da5457e195..0000000000
--- a/keyboards/amj40/keymaps/myee/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