Fix readme conflict #1

Merged
merged 1 commit into from Feb 2, 2012

Projects

None yet

1 participant

@alibby
Member
alibby commented Feb 2, 2012

This request fixes the readme conflict.

@alibby alibby merged commit daea944 into xforty:master Feb 2, 2012
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment