trying to pull
edits
trying to pull
fixed merge conflict
trying to make subscription work
did not modify
trying again
fixed merge conflicts
fixed merge conflicts
fixed merge conflict
pull
why
Merge branch 'master' of github.com:Eventalist/Eventalist into theerickramer
pulling
fixed merge conflict
trying to paginate
ok
idk why we keep getting merge conflicts:
fixed merge conflicts
fixed app merge conflicts