fix: conflicts

ochairo · Mar 24, 2024 · a623098 · a623098
1 parent b64f29c
commit a623098
Showing 1 changed file with 0 additions and 5 deletions.
diff --git 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