diff options
| author | William Chang <william@factual.com> | 2019-05-09 21:16:06 -0700 |
|---|---|---|
| committer | William Chang <william@factual.com> | 2019-05-09 21:16:06 -0700 |
| commit | 4b2d3288d013b1a71ea25402224c4a8225a099e9 (patch) | |
| tree | b7f5dded777a950e63c4dd967260744336bfaa6b /keyboards/handwired/frenchdev/config.h | |
| parent | 57a6ea11df685d84a1ea07953e88f224ce2b24f7 (diff) | |
| parent | bce391a663d2848bff8ffffca0e4bad771bd3890 (diff) | |
resolved conflicts
Diffstat (limited to 'keyboards/handwired/frenchdev/config.h')
| -rw-r--r-- | keyboards/handwired/frenchdev/config.h | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/keyboards/handwired/frenchdev/config.h b/keyboards/handwired/frenchdev/config.h index b01eec7aa0..eca6690905 100644 --- a/keyboards/handwired/frenchdev/config.h +++ b/keyboards/handwired/frenchdev/config.h @@ -15,8 +15,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef FRENCHDEV_V1_CONFIG_H -#define FRENCHDEV_V1_CONFIG_H +#pragma once #include "config_common.h" @@ -81,5 +80,3 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. //#define NO_ACTION_MACRO //#define NO_ACTION_FUNCTION //#define DEBUG_MATRIX_SCAN_RATE - -#endif //FRENCHDEV_V1_CONFIG_H |