[Conkeror] Development now occurring in the master branch of the git repository

[Jeremy Maitin-Shepard]

Do:

git fetch -f
git checkout master
git clean -d
git reset --hard origin/master

That should get you back to a good state.

-- 
Jeremy Maitin-Shepard