jeffreytse · dlfma · Jan 30, 2023 · Jan 30, 2023 · Jan 30, 2023 · Jan 30, 2023
diff --git a/_config.yml b/_config.yml
@@ -24,9 +24,14 @@
 # You can create any custom variable you would like, and they will be accessible
 # in the templates via {{ site.myvariable }}.
 
-title: Your awesome title
+<<<<<<< HEAD
+title: "dlfma의 blog"
+email: 
+=======
+title: "dlfma의 블로그"
 email: [email protected]
-author: GitHub User
+>>>>>>> a9699bb192f44d8b698c6dd32343e89209df20dc
+author: dlfma
 
 # Copyright setting
 # You can use any html code, currently below placeholders are available:
@@ -156,8 +161,8 @@ yat:
 # Page default value
 # defaults:
 #   home:
-#     heading: "Your awesome heading"
-#     subheading: "Your awesome subheading"
+#     heading: "Welcome to My Blog"
+#     subheading: "dlfma of Blog"
 #     banner: "Your image url"
 
 # Banner default settings

diff --git a/_data/defaults.yml b/_data/defaults.yml
diff --git a/_posts/2018-12-07-welcome-to-jekyll.md → _게시물/2018-12-07-welcome-to-jekyll.md b/_posts/2018-12-07-welcome-to-jekyll.md → _게시물/2018-12-07-welcome-to-jekyll.md
@@ -1,8 +1,8 @@
 ---
 layout: post
-title: Welcome to Jekyll!
-subtitle: A awesome static site generator.
-author: Jeffrey
+title: Welcome to dlfma!
+subtitle: dlfma의 블로그
+author: dlfma
 categories: jekyll
 banner:
   video: https://vjs.zencdn.net/v/oceans.mp4

diff --git a/_데이터/defaults.yml b/_데이터/defaults.yml
@@ -0,0 +1,4 @@
+home:
+  heading: "blog of dlfma"
+  subheading: "Welcom to my blog"
+  banner: "Your image url"
diff --git a/about.html b/about.html
@@ -6,12 +6,9 @@
 <h2>About</h2>
 
 <p>
-:art:&nbsp;Yet another theme for elegant writers with modern flat style
-and beautiful night mode.
+hello world
 </p>
 
 <p>
-Hey, nice to meet you, you found this Jekyll theme. Here the yet another
-theme is a modern theme, and it's quite clear, clean and neat for writers
-and posts.
+my first blog -dlfma
 </p>