[2.0.x] Azteeg X5 Mini WiFi

.github/contributing.md

@@ -132,7 +132,11 @@ Pull Requests should always be targeted to working branches (e.g., `bugfix-1.1.x
 
 * Use the present tense ("Add feature" not "Added feature").
 * Use the imperative mood ("Move cursor to..." not "Moves cursor to...").
+<<<<<<< HEAD
 * Limit the first line to 72 characters or fewer.
+=======
+* Limit the first line to 72 characters or less.
+>>>>>>> 1.1.x
 * Reference issues and Pull Requests liberally after the first line.
 
 ### C++ Coding Standards

.github/issue_template.md

@@ -1,6 +1,10 @@
 <!--
 
+<<<<<<< HEAD
 Have you read Marlin's Code of Conduct? By filing an Issue, you are expected to comply with it, including treating everyone with respect: https://github.com/MarlinFirmware/Marlin/blob/master/.github/code_of_conduct.md
+=======
+Have you read Marlin's Code of Conduct? By filing an Issue, you are expected to comply with it, including treating everyone with respect: https://github.com/MarlinFirmware/Marlin/blob/1.1.x/.github/code_of_conduct.md
+>>>>>>> 1.1.x
 
 Do you want to ask a question? Are you looking for support? Please don't post here. Instead please use the Marlin Firmware forum at http://forums.reprap.org/list.php?415 or the Marlin Facebook Group https://www.facebook.com/groups/1049718498464482/.
 
@@ -28,4 +32,8 @@ Before filing an issue be sure to test the 1.1 and/or 2.0 "bugfix" branches to s
 
 * Include a ZIP file containing your `Configuration.h` and `Configuration_adv.h` files.
 * Provide pictures or links to videos that clearly demonstrate the issue.
+<<<<<<< HEAD
 * See [How Can I Contribute](#how-can-i-contribute) for additional guidelines.
+=======
+* See [How Can I Contribute](https://github.com/MarlinFirmware/Marlin/blob/1.1.x/.github/contributing.md#how-can-i-contribute) for additional guidelines.
+>>>>>>> 1.1.x

.gitignore

@@ -119,6 +119,7 @@ tags
 .pio*
 .pioenvs
 .piolibdeps
+<<<<<<< HEAD
 .clang_complete
 .gcc-flags.json
 /lib/
@@ -145,6 +146,9 @@ Marlin/*/readme.txt
 Marlin/*/*/readme.txt
 Marlin/*/*/*/readme.txt
 Marlin/*/*/*/*/readme.txt
+=======
+lib/readme.txt
+>>>>>>> 1.1.x
 
 #Visual Studio
 *.sln