Glavo/minimal-mistakes
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Minor typo fix

Browse Source
This commit is contained in:
Francis T. O'Donovan 2016-06-21 09:53:54 -04:00 committed by GitHub
parent f033ebac69
commit 9c1bc43823
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
_docs/04-upgrading.md
View File

@ -29,7 +29,7 @@ Now you can pull any commits made to theme's `master` branch with:
$ git pull upstream master $ 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 ## 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. | | `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/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. | | `_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. | | `_config.yml` | Safe to keep. Verify that there were no major structural changes or additions. |