qmk_firmware

QMK firmware for my keyboards (Corne, Sweep Ferris) and trackball (Ploopy Adept)
Log | Files | Refs | Submodules | LICENSE

commit cced3ee6225f0eebaa8b0a1d9e18231bb334f352
parent 4e20740efa14f7f81b2ec6e5994bf79631abfb7f
Author: Dasky <32983009+daskygit@users.noreply.github.com>
Date:   Sun, 21 Jul 2024 01:53:11 +0100

Fix incorrect conflict resolution

Diffstat:
Mkeyboards/dailycraft/claw44/keymaps/oled/config.h | 2+-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/keyboards/dailycraft/claw44/keymaps/oled/config.h b/keyboards/dailycraft/claw44/keymaps/oled/config.h @@ -18,4 +18,4 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once -#define OLED_FONT_H "keyboards/claw44/lib/glcdfont.c" +#define OLED_FONT_H "claw44/lib/glcdfont.c"