+ ‘blog/doctrees/2014/07/01/’
- ‘blog/doctrees/2014/07/01/about.doctree’
Conflict resolution by SparkleShare