Skip to content
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

Merge key change code #7

Merged
merged 1 commit into from
Mar 23, 2016
Merged

Merge key change code #7

merged 1 commit into from
Mar 23, 2016

Conversation

masomel
Copy link
Member

@masomel masomel commented Mar 23, 2016

No description provided.

@masomel masomel merged commit b726b39 into master Mar 23, 2016
@arlolra
Copy link
Member

arlolra commented Mar 23, 2016

That doesn't look right.

@masomel
Copy link
Member Author

masomel commented Mar 23, 2016

What doesn't look right? I'm still fixing some quirks that happened when I rebased the branch from our internal repo.

@arlolra
Copy link
Member

arlolra commented Mar 23, 2016

The merged conflict markers,

<<<<<<< HEAD
...
=======
...
>>>>>>> Adding the new files

@arlolra
Copy link
Member

arlolra commented Mar 23, 2016

But yeah, looks like you've cleaned up the bad merge. Sorry for the noise.

@masomel masomel deleted the merge-mrochlin branch March 23, 2016 19:16
@masomel masomel mentioned this pull request May 27, 2016
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@masomel @arlolra @marisbest2