thomas
/
marlin
Watch 1
Star 0
Fork 0
Code Issues 0 Pull Requests 0 Releases 0 Wiki Activity
Browse Source

fixed merge conflict

Dirk Eichel 12 years ago
parent
b3ebb71704
commit
8efd4cfd73
1 changed files with 6 additions and 3 deletions
Unified View Show Diff Stats
  1. 6
    3
      Marlin/language.h

+ 6
- 3
Marlin/language.h View File

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 
 #define LANGUAGE_H
 4 
 #define LANGUAGE_H
3
5
4 
 // NOTE: IF YOU CHANGE THIS FILE / MERGE THIS FILE WITH CHANGES
 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 
 // Languages
 11 
 // Languages
10 
 // 1  English
 12 
 // 1  English
1462
1464
1463 
 #endif
 1465 
 #endif
1464 
 #endif // ifndef LANGUAGE_H
 1466 
 #endif // ifndef LANGUAGE_H
1467 
+</pre></body></html>

Write Preview
Loading…
Cancel
Save