diff options
author | fauxpark <fauxpark@gmail.com> | 2022-10-29 16:54:14 +1100 |
---|---|---|
committer | fauxpark <fauxpark@gmail.com> | 2022-10-29 16:54:14 +1100 |
commit | 9d717c85dc184c0e34b40251b5703ae3626f571e (patch) | |
tree | 9ef6e296e81a48b7c6f5d265e52e571b8a5bc3ba /users/manna-harbour_miryoku/config.h | |
parent | 22be7e79ac6a328ed5a7dc8c4e6f17d749852221 (diff) | |
parent | e90ff84c31905932849164204c10ea58255ddad2 (diff) |
Merge remote-tracking branch 'upstream/master' into develop
Diffstat (limited to 'users/manna-harbour_miryoku/config.h')
-rw-r--r-- | users/manna-harbour_miryoku/config.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/users/manna-harbour_miryoku/config.h b/users/manna-harbour_miryoku/config.h index c4538ee304..920003598e 100644 --- a/users/manna-harbour_miryoku/config.h +++ b/users/manna-harbour_miryoku/config.h @@ -5,6 +5,8 @@ #pragma once +#include "custom_config.h" + // default but used in macros #undef TAPPING_TERM #define TAPPING_TERM 200 @@ -39,5 +41,3 @@ #define EXTRA_SHORT_COMBOS #endif -#include "custom_config.h" - |