diff --git a/_docs/04-upgrading.md b/_docs/04-upgrading.md index f0643542..712c1e95 100644 --- a/_docs/04-upgrading.md +++ b/_docs/04-upgrading.md @@ -29,7 +29,7 @@ Now you can pull any commits made to theme's `master` branch with: $ git pull upstream master ``` -Depending on the amount of customizations you've made after forking, there's likely to be merge conflicts. Work through any conflicting files Git flags, stagging the changes you wish to keep, and then commit them. +Depending on the amount of customizations you've made after forking, there's likely to be merge conflicts. Work through any conflicting files Git flags, staging the changes you wish to keep, and then commit them. ## Update Files Manually @@ -44,4 +44,4 @@ Here's a quick checklist of the important folders/files you'll want to be mindfu | `assets` | Replace all. Apply edits if you customized stylesheets or scripts. | | `_data/navigation.yml` | Safe to keep. Verify that there were no major structural changes or additions. | | `_data/ui-text.yml` | Safe to keep. Verify that there were no major structural changes or additions. | -| `_config.yml` | Safe to keep. Verify that there were no major structural changes or additions. | \ No newline at end of file +| `_config.yml` | Safe to keep. Verify that there were no major structural changes or additions. |