Merge pigen to master

This commit is contained in:
Serge Schneider 2020-09-23 20:02:52 +01:00 committed by Logan Gartner
parent c29425e838
commit 91b07f2f90
Signed by: logan
GPG key ID: E328528C921E7A7A

View file

@ -1,6 +1,3 @@
<<<<<<< HEAD
# TouchPrint
TouchPrint is a lightweight fork of Raspberry Pi OS whos purpose is to host OctoPrint and to display it on a connected screen.
TouchPrint is very customizable, and both the GUI and/or OctoPrint can be disabled if you already have an existing setup to perform those tasks.
# Table of Contents