MPCNC/Firmware2
1
0
Fork 0
Code Issues 1 Pull Requests Releases Wiki Activity

fixed merge conflict

Browse Source
This commit is contained in:
Dirk Eichel 2013-03-01 16:27:35 +01:00
parent b3ebb71704
commit 8efd4cfd73
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Marlin/language.h
View File

@ -1,10 +1,12 @@
#ifndef LANGUAGE_H
<!-- saved from url=(0066)https://raw.github.com/ErikZalm/Marlin/Marlin_v1/Marlin/language.h -->
<html><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"></head><body><pre style="word-wrap: break-word; white-space: pre-wrap;">#ifndef LANGUAGE_H
#define LANGUAGE_H #define LANGUAGE_H
// NOTE: IF YOU CHANGE THIS FILE / MERGE THIS FILE WITH CHANGES // NOTE: IF YOU CHANGE THIS FILE / MERGE THIS FILE WITH CHANGES
// //
// ==> ALWAYS TRY TO COMPILE MARLIN WITH/WITHOUT "ULTIPANEL" / "ULTRALCD" / "SDSUPPORT" #define IN "Configuration.h" // ==&gt; ALWAYS TRY TO COMPILE MARLIN WITH/WITHOUT "ULTIPANEL" / "ULTRALCD" / "SDSUPPORT" #define IN "Configuration.h"
// ==> ALSO TRY ALL AVAILABLE "LANGUAGE_CHOICE" OPTIONS // ==&gt; ALSO TRY ALL AVAILABLE "LANGUAGE_CHOICE" OPTIONS
// Languages // Languages
// 1 English // 1 English
@ -1462,3 +1464,4 @@
#endif #endif
#endif // ifndef LANGUAGE_H #endif // ifndef LANGUAGE_H
</pre></body></html>