WardCunningham/Smallest-Federated-Wiki — pull request #222 by hallahan (2012-05-08 03:28:26+00:00)
Title: manual merge

I just did a git mergetool and selected the your state in the last commit for everything. For some reason there were conflicts when I pulled your repo. I did a hard reset of my head to the state of my github that I did the last pull request with. There shouldn't have been conflicts. Let me know if this is how this should be fixed or if there is a better way.

Merge branch 'master' of https://github.com/WardCunningham/Smallest-Federated-Wiki

Conflicts:
client/client.js
client/lib/refresh.coffee
client/test/testclient.js
server/express/views/style.css
server/sinatra/views/style.css
server/sinatra/views/style.sass