From a62309831a655f3cb6da700ffb5e39e522f7abc9 Mon Sep 17 00:00:00 2001
From: ochairo <19258508+ochairo@users.noreply.github.com>
Date: Sun, 24 Mar 2024 16:56:15 +0900
Subject: [PATCH] fix: conflicts

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

diff --git a/README.md b/README.md
index d7ae2b2..d689564 100644
--- a/README.md
+++ b/README.md
@@ -49,12 +49,7 @@ the concepts themselves are complex and hard to understand.
 │   │   │   ├── http                  # - HTTP-related code
 │   │   │   └── router                # - Router code
 │   │   ├── shared                    # - Shared components and utilities
-<<<<<<< Updated upstream
-│   │   │   ├── router                # - Router
-│   │   │   ├── styles                # - Stylesheets
-=======
 │   │   │   ├── styles                # - Shared stylesheets
->>>>>>> Stashed changes
 │   │   │   └── ui-components         # - Reusable UI components
 │   │   │       ├── atoms             # - Basic UI elements
 │   │   │       ├── molecules         # - Simple component compositions