Merge branch 'tft-lcd'

3 months ago · eb6eb187ab
2 changed files with 2 additions and 1 deletions
--- a/File.txt
+++ b/File.txt
@ -1 +1,2 @@
-the  line
+the first line
+the socond line
--- a/tft.txt
+++ b/tft.txt