# Conflicts:
#    README.md
This commit is contained in:
Alexander R.
2026-07-21 22:27:10 +00:00
+4
View File
@@ -1,5 +1,6 @@
# TactiTerm # TactiTerm
<<<<<<< HEAD
**Tactile Terminal:** A WebUI / TUI built to help teach and study programming concepts in an interactive, hands-on way. **Tactile Terminal:** A WebUI / TUI built to help teach and study programming concepts in an interactive, hands-on way.
--- ---
@@ -131,3 +132,6 @@ When initialized, TactiTerm automatically generates a `config.json` file in the
## 📜 License ## 📜 License
MIT License. See `LICENSE` for details. MIT License. See `LICENSE` for details.
=======
Tactile Terminal: A WebUI / TUI built to help teach and and study programming concepts in an interactive way.
>>>>>>> branch 'main' of https://git.dewm.ca/dewm/TactiTerm.git