- ‘log/doctrees/2014/07/01/’
/ ‘log/doctrees/environment.pickle’
- ‘log/html/.buildinfo’
- ‘log/html/2014/07/01/about.html’
- ‘log/html/2014/07/03/definition.html’
- ‘log/html/_sources/2014/07/01/about.txt’
- ‘log/html/_sources/2014/07/03/definition.txt’
- ‘log/html/_sources/master.txt’
- ‘log/html/_sources/pages/about.txt’
- ‘log/html/_sources/pages/links.txt’
...
Conflict resolution by SparkleShare
+ ‘blog/doctrees/2014/07/01/’
- ‘blog/doctrees/2014/07/01/about.doctree’