]> git.donarmstrong.com Git - qmk_firmware.git/commitdiff
removed my personal stuff
authorToni <jeder@mail1a.de>
Mon, 15 Aug 2016 18:32:45 +0000 (20:32 +0200)
committerToni <jeder@mail1a.de>
Mon, 15 Aug 2016 18:32:45 +0000 (20:32 +0200)
keyboards/satan/keymaps/iso_split_rshift/.gitignore [new file with mode: 0644]
keyboards/satan/keymaps/iso_split_rshift/updatemerge.sh [deleted file]

diff --git a/keyboards/satan/keymaps/iso_split_rshift/.gitignore b/keyboards/satan/keymaps/iso_split_rshift/.gitignore
new file mode 100644 (file)
index 0000000..4d65266
--- /dev/null
@@ -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 (executable)
index d17ec76..0000000
+++ /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