Christopher K. Hoadley
|
92879af8eb
|
Merge remote-tracking branch 'origin/master' into restructure_take1
# Conflicts:
# README.md
# sherlock/sherlock.py
|
4 years ago |
Christopher K. Hoadley
|
32385a1d8d
|
Merge remote-tracking branch 'origin/master' into restructure_take1
|
4 years ago |
Christopher K. Hoadley
|
e41b485771
|
Merge remote-tracking branch 'origin/master' into restructure_take1
|
4 years ago |
Christopher K. Hoadley
|
123e4d47e0
|
Merge remote-tracking branch 'origin/master' into restructure_take1
|
5 years ago |
Christopher K. Hoadley
|
ba0a44e0ae
|
Merge remote-tracking branch 'origin/master' into restructure_take1
# Conflicts:
# sherlock/resources/data.json
|
5 years ago |
Christopher K. Hoadley
|
9e8e1a5aa4
|
Merge remote-tracking branch 'origin/master' into restructure_take1
# Conflicts:
# sherlock/sherlock.py
|
5 years ago |
Christopher K. Hoadley
|
0a455339c2
|
Merge remote-tracking branch 'origin/master' into restructure_take1
|
5 years ago |
Christopher K. Hoadley
|
b92b931504
|
Merge remote-tracking branch 'origin/master' into restructure_take1
# Conflicts:
# sherlock/sherlock.py
|
5 years ago |
Christopher K. Hoadley
|
b0b7608549
|
Merge remote-tracking branch 'origin/master' into restructure_take1
# Conflicts:
# sherlock/sherlock.py
|
5 years ago |
Christopher K. Hoadley
|
f89fe03b34
|
Merge remote-tracking branch 'origin/master' into restructure_take1
# Conflicts:
# sherlock/sherlock.py
|
5 years ago |
Christopher K. Hoadley
|
a900d0f674
|
Merge remote-tracking branch 'origin/master' into restructure_take1
# Conflicts:
# sherlock/sherlock.py
|
5 years ago |
Christopher K. Hoadley
|
8ef999fffd
|
Merge remote-tracking branch 'origin/master' into restructure_take1
|
5 years ago |
Christopher K. Hoadley
|
1587df0860
|
Merge remote-tracking branch 'origin/master' into restructure_take1
|
5 years ago |
Christopher K. Hoadley
|
d17268e737
|
Move content into sherlock sub-directory inside of repo. This directory will look very much like what the packaged version of Sherlock will look like when it is installed in the site-packages area.
No real restructuring of the code has happened. This just gives a view of the directory structure.
|
5 years ago |