Fix incorrect conflict resolution

This commit is contained in:
Dasky 2024-07-21 01:53:11 +01:00
parent 4e20740efa
commit cced3ee622

View file

@ -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"