Upstream

_config.yml

@@ -8,38 +8,67 @@ theme: jekyll-theme-chirpy
 # otherwise, the layout language will use the default value of 'en'.
 lang: en
 
+<<<<<<< HEAD
+
+# Change to your timezone › http://www.timezoneconverter.com/cgi-bin/findzone/findzone
+timezone: Asia/Seoul
+=======
 # Change to your timezone › https://kevinnovak.github.io/Time-Zone-Picker
 timezone: Asia/Shanghai
+>>>>>>> 54d4d59d22ac543a14bfbd9bb3d6fb6756056041
 
 # jekyll-seo-tag settings › https://github.com/jekyll/jekyll-seo-tag/blob/master/docs/usage.md
 # ↓ --------------------------
 
+<<<<<<< HEAD
+title: Kwon                          # the main title
+
+tagline: Studying   # it will display as the sub-title
+=======
 title: Chirpy # the main title
 
 tagline: A text-focused Jekyll theme # it will display as the subtitle
+>>>>>>> 54d4d59d22ac543a14bfbd9bb3d6fb6756056041
 
 description: >- # used by seo meta and the atom feed
   A minimal, responsive and feature-rich Jekyll theme for technical writing.
 
+<<<<<<< HEAD
+# fill in the protocol & hostname for your site, e.g., 'https://username.github.io'
+url: 'https://qja1998.github.io'
+
+github:
+  username: qja1998             # change to your github username
+=======
 # Fill in the protocol & hostname for your site.
 # E.g. 'https://username.github.io', note that it does not end with a '/'.
 url: ""
 
 github:
   username: github_username # change to your GitHub username
+>>>>>>> 54d4d59d22ac543a14bfbd9bb3d6fb6756056041
 
 twitter:
   username: twitter_username # change to your Twitter username
 
 social:
   # Change to your full name.
   # It will be displayed as the default author of the posts and the copyright owner in the Footer
+<<<<<<< HEAD
+  name: GiBeom Kwon
+  email: [email protected]             # change to your email address
+  links:
+    # The first element serves as the copyright owner's link
+    #- https://twitter.com/username      # change to your twitter homepage
+    - https://github.com/qja1998       # change to your github homepage
+=======
   name: your_full_name
   email: [email protected] # change to your email address
   links:
     # The first element serves as the copyright owner's link
     - https://twitter.com/username # change to your Twitter homepage
     - https://github.com/username # change to your GitHub homepage
+>>>>>>> 54d4d59d22ac543a14bfbd9bb3d6fb6756056041
     # Uncomment below to add more social links
     # - https://www.facebook.com/username
     # - https://www.linkedin.com/in/username
@@ -88,17 +117,28 @@ pageviews:
 #     light — Use the light color scheme
 #     dark — Use the dark color scheme
 #
+<<<<<<< HEAD
+theme_mode: light  # [light|dark]
+=======
 theme_mode: # [light | dark]
+>>>>>>> 54d4d59d22ac543a14bfbd9bb3d6fb6756056041
 
 # The CDN endpoint for media resources.
 # Notice that once it is assigned, the CDN url
 # will be added to all media resources (site avatar, posts' images, audio and video files) paths starting with '/'
 #
 # e.g. 'https://cdn.com'
+<<<<<<< HEAD
+img_cdn: '/assets/img'
+
+# the avatar on sidebar, support local or CORS resources
+avatar: '/avatar/avatar.jpg'
+=======
 cdn: "https://chirpy-img.netlify.app"
 
 # the avatar on sidebar, support local or CORS resources
 avatar: "/commons/avatar.jpg"
+>>>>>>> 54d4d59d22ac543a14bfbd9bb3d6fb6756056041
 
 # The URL of the site-wide social preview image used in SEO `og:image` meta tag.
 # It can be overridden by a customized `page.image` in front matter.
@@ -108,18 +148,31 @@ social_preview_image: # string, local or CORS resources
 toc: true
 
 comments:
+<<<<<<< HEAD
+  active: utterances         # The global switch for posts comments, e.g., 'disqus'.  Keep it empty means disable
+  # The active options are as follows:
+=======
   # Global switch for the post-comment system. Keeping it empty means disabled.
   provider: # [disqus | utterances | giscus]
   # The provider options are as follows:
+>>>>>>> 54d4d59d22ac543a14bfbd9bb3d6fb6756056041
   disqus:
     shortname: # fill with the Disqus shortname. › https://help.disqus.com/en/articles/1717111-what-s-a-shortname
   # utterances settings › https://utteranc.es/
   utterances:
+<<<<<<< HEAD
+    repo: qja1998/qja1998.github.io        # <gh-username>/<repo>
+    issue_term:   # < url | pathname | title | ...>
+  # Giscus options › https://giscus.app
+  giscus:
+    repo:           # <gh-username>/<repo>
+=======
     repo: # <gh-username>/<repo>
     issue_term: # < url | pathname | title | ...>
   # Giscus options › https://giscus.app
   giscus:
     repo: # <gh-username>/<repo>
+>>>>>>> 54d4d59d22ac543a14bfbd9bb3d6fb6756056041
     repo_id:
     category:
     category_id: