update

.gitignore

@@ -5,10 +5,7 @@ Gemfile.lock
 
 # Jekyll cache
 .jekyll-cache
-<<<<<<< HEAD
-=======
 .jekyll-metadata
->>>>>>> v7.2.0
 _site
 
 # RubyGems
@@ -20,16 +17,11 @@ package-lock.json
 
 # IDE configurations
 .idea
-<<<<<<< HEAD
-
-# Misc
-=======
 .vscode/*
 !.vscode/settings.json
 !.vscode/extensions.json
 !.vscode/tasks.json
 
 # Misc
 _sass/vendors
->>>>>>> v7.2.0
 assets/js/dist

README.md

@@ -25,45 +25,19 @@ Jekyll site. The following is a list of targets:
 To save you time, and also in case you lose some files while copying, we extract those files/configurations of the
 latest version of the **Chirpy** theme and the [CD][CD] workflow to here, so that you can start writing in minutes.
 
-<<<<<<< HEAD
-## Prerequisites
-
-Follow the instructions in the [Jekyll Docs](https://jekyllrb.com/docs/installation/) to complete the installation of
-the basic environment. [Git](https://git-scm.com/) also needs to be installed.
-
-## Installation
-
-Sign in to GitHub and [**use this template**][use-template] to generate a brand new repository and name it
-`USERNAME.github.io`, where `USERNAME` represents your GitHub username.
-
-Then clone it to your local machine and run:
-
-```console
-$ bundle
-```
-
-## Usage
-
-Please see the [theme's docs](https://github.com/cotes2020/jekyll-theme-chirpy#documentation).
-=======
 ## Usage
 
 Check out the [theme's docs](https://github.com/cotes2020/jekyll-theme-chirpy/wiki).
 
 ## Contributing
 
 This repository is automatically updated with new releases from the theme repository. If you encounter any issues or want to contribute to its improvement, please visit the [theme repository][chirpy] to provide feedback.
->>>>>>> v7.2.0
 
 ## License
 
 This work is published under [MIT][mit] License.
 
 [gem]: https://rubygems.org/gems/jekyll-theme-chirpy
 [chirpy]: https://github.com/cotes2020/jekyll-theme-chirpy/
-<<<<<<< HEAD
-[use-template]: https://github.com/cotes2020/chirpy-starter/generate
-=======
->>>>>>> v7.2.0
 [CD]: https://en.wikipedia.org/wiki/Continuous_deployment
 [mit]: https://github.com/cotes2020/chirpy-starter/blob/master/LICENSE