Skip to content

Rosie chris#20

Merged
rtuts67 merged 4 commits intodevfrom
rosie-chris
Jan 5, 2017
Merged

Rosie chris#20
rtuts67 merged 4 commits intodevfrom
rosie-chris

Conversation

@olds1423
Copy link
Collaborator

@olds1423 olds1423 commented Jan 4, 2017

Finished scaffolding

@dkulp23
Copy link
Owner

dkulp23 commented Jan 5, 2017

@olds1423 @rtuts67
I was trying to navigate through the merge conflicts but wasn't sure which code to delete and which to keep. Can one of you take a look through it?

@rtuts67 rtuts67 closed this Jan 5, 2017
@rtuts67 rtuts67 reopened this Jan 5, 2017
@rtuts67 rtuts67 merged commit 2d9b566 into dev Jan 5, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants