From f89aec98aebc3831e4c51acd5990b2025efc7758 Mon Sep 17 00:00:00 2001 From: Toni Date: Mon, 15 Aug 2016 20:32:45 +0200 Subject: removed my personal stuff --- keyboards/satan/keymaps/iso_split_rshift/.gitignore | 3 +++ keyboards/satan/keymaps/iso_split_rshift/updatemerge.sh | 4 ---- 2 files changed, 3 insertions(+), 4 deletions(-) create mode 100644 keyboards/satan/keymaps/iso_split_rshift/.gitignore delete mode 100755 keyboards/satan/keymaps/iso_split_rshift/updatemerge.sh diff --git a/keyboards/satan/keymaps/iso_split_rshift/.gitignore b/keyboards/satan/keymaps/iso_split_rshift/.gitignore new file mode 100644 index 0000000000..4d652661c6 --- /dev/null +++ b/keyboards/satan/keymaps/iso_split_rshift/.gitignore @@ -0,0 +1,3 @@ +updatemerge.sh +clear_flash.hex +resetboard.sh diff --git a/keyboards/satan/keymaps/iso_split_rshift/updatemerge.sh b/keyboards/satan/keymaps/iso_split_rshift/updatemerge.sh deleted file mode 100755 index d17ec76ecd..0000000000 --- a/keyboards/satan/keymaps/iso_split_rshift/updatemerge.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/bash -git checkout iso_split_rshift # gets you "on branch dmgr2" -git fetch origin # gets you up to date with origin -git merge origin/master -- cgit v1.2.3