not sure why pull worked here, but fetch+merge didn't

This commit is contained in:
D. Joe 2016-08-13 14:44:49 -04:00
commit 17f1e87895
1 changed files with 2 additions and 2 deletions

View File

@ -20,6 +20,7 @@ expansions in scope will be considered.
* white knighting
* trolling
* trolling, concern
* bikeshed painting
Some combiners:
@ -36,5 +37,4 @@ Some combiners:
* Professor of
If you really want to limber your psyche up for this sort of thing, just read through [this list of titles and styles](https://web.tproa.net/)
If you really want to limber your psyche up for this sort of thing, just read through [this list of titles and styles](https://web.tproa.net/official.sig.txt)