From 1aeb59335f2fe67613df25308a630ca453975ac0 Mon Sep 17 00:00:00 2001
From: Didier Loiseau <didierloiseau+git@gmail.com>
Date: Sun, 11 Sep 2016 02:19:55 +0200
Subject: [PATCH] Fixed compilation issues after the merge
---
.../bepo => keyboards/ergodox/keymaps/bepo_csa}/keymap.c | 2 +-
quantum/keymap_extras/keymap_canadian_multilingual.h | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
rename {keyboard/ergodox_ez/keymaps/bepo => keyboards/ergodox/keymaps/bepo_csa}/keymap.c (99%)
diff --git a/keyboard/ergodox_ez/keymaps/bepo/keymap.c b/keyboards/ergodox/keymaps/bepo_csa/keymap.c
similarity index 99%
rename from keyboard/ergodox_ez/keymaps/bepo/keymap.c
rename to keyboards/ergodox/keymaps/bepo_csa/keymap.c
index 7097d641d9..495242adb3 100644
--- a/keyboard/ergodox_ez/keymaps/bepo/keymap.c
+++ b/keyboards/ergodox/keymaps/bepo_csa/keymap.c
@@ -1,5 +1,5 @@
/* TypeMatrix-2030-like keymap */
-#include "ergodox_ez.h"
+#include "ergodox.h"
#include "debug.h"
#include "action_layer.h"
#include "action_util.h"
diff --git a/quantum/keymap_extras/keymap_canadian_multilingual.h b/quantum/keymap_extras/keymap_canadian_multilingual.h
index c720088e8c..0bc20c7b9c 100644
--- a/quantum/keymap_extras/keymap_canadian_multilingual.h
+++ b/quantum/keymap_extras/keymap_canadian_multilingual.h
@@ -1,7 +1,7 @@
#ifndef KEYMAP_CANADIAN_MULTILINGUAG_H
#define KEYMAP_CANADIAN_MULTILINGUAG_H
-#include "keymap_common.h"
+#include "keymap.h"
// Alt gr
#ifndef ALTGR