~sky/blog

a974c44b4ff336b8d13b41bbe8f3412abdc240f6 — sky 1 year, 7 months ago d9b7f6a
Fixing version strangeness
1 files changed, 0 insertions(+), 10 deletions(-)

M README.md
M README.md => README.md +0 -10
@@ 24,21 24,11 @@ Execute:
Where 'article name' is the name of the article you wish to upload. 

## Back-End:
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> a741f182af7805e3d35b8d1e81f31baa52d9a274

This script works by putting together a series of files which will make a
single webpage. It takes the '.head' files and the '.html' files from 'input',
combines them with templates from the 'templates' directory, and sends them to
<<<<<<< HEAD
the 'output' directory. The script then uploads the files in the 'output' directory to the given hosting service. 
=======
the 'output' directory. The script then uploads the files in the 'output'
directory to the given hosting service. 
=======
>>>>>>> 998875473d11102922746df1d418a74726ef4e6f
>>>>>>> a741f182af7805e3d35b8d1e81f31baa52d9a274