Fix incorrect conflict resolution
This commit is contained in:
parent
4e20740efa
commit
cced3ee622
1 changed files with 1 additions and 1 deletions
|
@ -18,4 +18,4 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
#define OLED_FONT_H "keyboards/claw44/lib/glcdfont.c"
|
#define OLED_FONT_H "claw44/lib/glcdfont.c"
|
||||||
|
|
Loading…
Reference in a new issue