- ‘log/doctrees/2014/07/01/’
/ ‘log/doctrees/environment.pickle’
/ ‘log/doctrees/master.doctree’
- ‘log/html/.buildinfo’
/ ‘log/html/2014/07/01/about.html’
/ ‘log/html/2014/07/03/definition.html’
/ ‘log/html/2014/07/04/test.html’
/ ‘log/html/2014/07/04/test2.html’
/ ‘log/html/_sources/2014/07/04/test2.txt’
- ‘log/html/_sources/master.txt’
...
Conflict resolution by SparkleShare
- ‘about (Brent Hueth, Jul 4 12h20).doctree’
- ‘environment (Brent Hueth, Jul 4 12h20).pickle’
- ‘master (Brent Hueth, Jul 4 12h20).doctree’
- ‘tset3 (Brent Hueth, Jul 4 12h20).doctree’