Update README.md

2026-07-21 18:35:44 -04:00
parent e9c32f9413
commit e494bcc2cc
1 changed files with 0 additions and 8 deletions
@@ -1,6 +1,5 @@
 # TactiTerm

-<<<<<<< HEAD
 **Tactile Terminal:** A WebUI / TUI built to help teach and study programming concepts in an interactive, hands-on way.

 ---
@@ -128,10 +127,3 @@ When initialized, TactiTerm automatically generates a `config.json` file in the
 - **Web Client (`frontend/`):** React + TypeScript SPA powered by Vite, Tailwind CSS, and Monaco Editor.

 ---
-
-## 📜 License
-
-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