Merge pull request #311 from adiabatic/ergodox-zweihander-osx

author Erez Zukerman <bulk@ezuk.org>

Fri, 6 May 2016 22:28:43 +0000 (18:28 -0400)

committer Erez Zukerman <bulk@ezuk.org>

Fri, 6 May 2016 22:28:43 +0000 (18:28 -0400)
author Erez Zukerman <bulk@ezuk.org>
Fri, 6 May 2016 22:28:43 +0000 (18:28 -0400)
committer Erez Zukerman <bulk@ezuk.org>
Fri, 6 May 2016 22:28:43 +0000 (18:28 -0400)
diff --cc README.md
Simple merge
diff --cc quantum/keymap_common.h
Simple merge
author	Erez Zukerman <bulk@ezuk.org>
	Fri, 6 May 2016 22:28:43 +0000 (18:28 -0400)
committer	Erez Zukerman <bulk@ezuk.org>
	Fri, 6 May 2016 22:28:43 +0000 (18:28 -0400)
		1	2
README.md	patch \|	diff1 \|	diff2 \|	blob \| history
quantum/keymap_common.h	patch \|	diff1 \|	diff2 \|	blob \| history