Procházet zdrojové kódy

fixed merge conflict

Dirk Eichel před 12 roky
rodič
revize
8efd4cfd73
1 změnil soubory, kde provedl 6 přidání a 3 odebrání
  1. 6
    3
      Marlin/language.h

+ 6
- 3
Marlin/language.h Zobrazit soubor

@@ -1,10 +1,12 @@
1
-#ifndef LANGUAGE_H
1
+
2
+<!-- saved from url=(0066)https://raw.github.com/ErikZalm/Marlin/Marlin_v1/Marlin/language.h -->
3
+<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
2 4
 #define LANGUAGE_H
3 5
 
4 6
 // NOTE: IF YOU CHANGE THIS FILE / MERGE THIS FILE WITH CHANGES
5 7
 //
6
-//   ==> ALWAYS TRY TO COMPILE MARLIN WITH/WITHOUT "ULTIPANEL" / "ULTRALCD" / "SDSUPPORT" #define IN "Configuration.h" 
7
-//   ==> ALSO TRY ALL AVAILABLE "LANGUAGE_CHOICE" OPTIONS
8
+//   ==&gt; ALWAYS TRY TO COMPILE MARLIN WITH/WITHOUT "ULTIPANEL" / "ULTRALCD" / "SDSUPPORT" #define IN "Configuration.h" 
9
+//   ==&gt; ALSO TRY ALL AVAILABLE "LANGUAGE_CHOICE" OPTIONS
8 10
 
9 11
 // Languages
10 12
 // 1  English
@@ -1462,3 +1464,4 @@
1462 1464
 
1463 1465
 #endif
1464 1466
 #endif // ifndef LANGUAGE_H
1467
+</pre></body></html>

Loading…
Zrušit
Uložit