diff options
| author | William Chang <william@factual.com> | 2019-05-09 21:16:06 -0700 |
|---|---|---|
| committer | William Chang <william@factual.com> | 2019-05-09 21:16:06 -0700 |
| commit | 4b2d3288d013b1a71ea25402224c4a8225a099e9 (patch) | |
| tree | b7f5dded777a950e63c4dd967260744336bfaa6b /keyboards/gergo/keymaps/germ/rules.mk | |
| parent | 57a6ea11df685d84a1ea07953e88f224ce2b24f7 (diff) | |
| parent | bce391a663d2848bff8ffffca0e4bad771bd3890 (diff) | |
resolved conflicts
Diffstat (limited to 'keyboards/gergo/keymaps/germ/rules.mk')
| -rw-r--r-- | keyboards/gergo/keymaps/germ/rules.mk | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/keyboards/gergo/keymaps/germ/rules.mk b/keyboards/gergo/keymaps/germ/rules.mk index 2f825a7663..badfe7bb99 100644 --- a/keyboards/gergo/keymaps/germ/rules.mk +++ b/keyboards/gergo/keymaps/germ/rules.mk @@ -27,6 +27,7 @@ ifneq ($(strip $(SCROLLSTEP)),) endif ifeq ($(strip $(BALLER)), yes) OPT_DEFS += -DBALLER + POINTING_DEVICE_ENABLE = yes endif ifeq ($(strip $(DEBUG_BALLER)), yes) OPT_DEFS += -DDEBUG_BALLER |