From e494bcc2cc84483785ff1ebc1e4ac1d799eb6713 Mon Sep 17 00:00:00 2001
From: Dewm <dewm@mail.dewm.ca>
Date: Tue, 21 Jul 2026 18:35:44 -0400
Subject: [PATCH] Update README.md

---
 README.md | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/README.md b/README.md
index fe1317e..09f6bd6 100644
--- a/README.md
+++ b/README.md
@@ -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