Fix #3 #18

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Open

EmyrClement wants to merge 1 commit into BristolComputing:master from EmyrClement:fixIssue3

Contributor

EmyrClement commented Feb 13, 2015

So conflicts.

Contributor

Lana-B commented Feb 13, 2015

You love the drama


          Fix BristolComputing#3

ab4e553

EmyrClement force-pushed the fixIssue3 branch from b5d0d2a to ab4e553 Compare

February 13, 2015 14:11

Contributor Author

EmyrClement commented Feb 13, 2015

I have fixed the stupid conflicts Luke put in.

Contributor

kreczko commented Feb 16, 2015

No you haven't. There are more of them.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet