diff options
| author | Toni <jeder@mail1a.de> | 2016-08-15 20:32:45 +0200 |
|---|---|---|
| committer | Toni <jeder@mail1a.de> | 2016-08-15 20:32:45 +0200 |
| commit | f89aec98aebc3831e4c51acd5990b2025efc7758 (patch) | |
| tree | b10a71da429479b35397871e6b3330a737804ff9 /keyboards/satan | |
| parent | 5ecebc3a66946ac7579bcd3afdacdb61387412d1 (diff) | |
removed my personal stuff
Diffstat (limited to 'keyboards/satan')
| -rw-r--r-- | keyboards/satan/keymaps/iso_split_rshift/.gitignore | 3 | ||||
| -rwxr-xr-x | keyboards/satan/keymaps/iso_split_rshift/updatemerge.sh | 4 |
2 files changed, 3 insertions, 4 deletions
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 |