From 19776186ba7cd7e1b26c9d2bec2adca702b47dfa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=9CyongLeeJ=E2=80=9D?= <“dhr385@naver.com”>
Date: Tue, 24 Jun 2025 16:11:03 +0900
Subject: [PATCH] conflicts

---
 index.html | 61 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 61 insertions(+)
 create mode 100644 index.html
diff --git a/index.html b/index.html
new file mode 100644
index 0000000..407a34b
--- /dev/null
+++ b/index.html
@@ -0,0 +1,61 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+  <meta charset="UTF-8" />
+  <meta name="viewport" content="width=device-width, initial-scale=1.0"/>
+  <title>My Personal GitHub Page</title>
+  <style>
+    body {
+      font-family: Arial, sans-serif;
+      padding: 2rem;
+      background-color: #f4f4f4;
+    }
+    h1, h2 {
+      color: #333;
+    }
+    ul {
+      list-style: none;
+      padding-left: 0;
+    }
+    li {
+      background: #fff;
+      margin-bottom: 0.5rem;
+      padding: 1rem;
+      border-radius: 6px;
+      box-shadow: 0 2px 4px rgba(0, 0, 0, 0.1);
+    }
+    p {
+      margin: 0.5rem;
+    }
+    a {
+      text-decoration: none;
+      color: #007acc;
+      font-weight: bold;
+    }
+  </style>
+</head>
+<body>
+  <h1>👤 Welcome to My GitHub Page</h1>
+  <p>This page is part of my GitHub practice project.</p>
+  <p>My name is Ji Yong Lee and user number is 32193541.</p>
+
+  <h2>📄 My Pages</h2>
+  <ul>
+    <li><a href="about.html">About Me</a></li>
+    <li><a href="skills.html">My Skills</a></li>
+    <li><a href="projects.html">My Projects</a></li>
+    <li><a href="contact.html">Contact Me</a></li>
+  </ul>
+
+  <h2>📝 What I Practiced</h2>
+  <ul>
+    <li>✅ Cloned this repository to local machine</li>
+    <li>✅ Created and switched between branches</li>
+    <li>✅ Made commits for different sections</li>
+    <li>✅ Merged branches using pull requests</li>
+    <li>✅ Resolved merge conflicts (if any)</li>
+    <li>✅ Pushed changes to GitHub</li>
+    <li>✅ Used GitHub Pages to publish this site</li>
+  </ul>
+</body>
+</html>
\ No newline at end of file
