From fa740f81298dc0965970a4dc7b0b67285bd1985c Mon Sep 17 00:00:00 2001 From: James Young <18669334+noroadsleft@users.noreply.github.com> Date: Sun, 14 Feb 2021 23:21:45 -0800 Subject: AMJ40 Refactor (#11854) * update keyboard source files - add license headers (attributed to original keyboard submitter) - #pragma once include guards - file template matching - readme update and template matching * set sensible default keyboard settings - enable Bootmagic Lite and Mouse Keys - disable Console and Command - remove default keymap's rules.mk file * remove unnecessary files from default keymap * refactor default keymap * add additional layouts/keymaps * update keyboard readme - add images and bootloader instructions - reformat link list * convert tabs to spaces in default keymap --- keyboards/amj40/keymaps/default/updatemerge.sh | 4 ---- 1 file changed, 4 deletions(-) delete mode 100755 keyboards/amj40/keymaps/default/updatemerge.sh (limited to 'keyboards/amj40/keymaps/default/updatemerge.sh') 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 -- cgit v1.2.3