2014-07-06 11:57:54 CP Server Thread-8 :: "/usr/bin/git" pull origin master returned : From https://github.com/midgetspy/Sick-Beard
 * branch            master     -> FETCH_HEAD
error: Your local changes to 'data/interfaces/default/config_postProcessing.tmpl' would be overwritten by merge.  Aborting.
Please, commit your changes or stash them before you can merge.
Updating 0e81fe9..e5abe14