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

Team page has a broken merge #8

Closed
sbuzonas opened this issue May 5, 2016 · 2 comments
Closed

Team page has a broken merge #8

sbuzonas opened this issue May 5, 2016 · 2 comments
Assignees
@kauffj

Comments

@sbuzonas
Copy link

sbuzonas commented May 5, 2016

Unresolved merge conflicts.

The page at https://lbry.io/team has a number of unresolved merge conflicts.
@lyoshenka lyoshenka assigned lyoshenka and kauffj and unassigned lyoshenka May 5, 2016
@lyoshenka
Copy link
Member

Thanks for letting us know. We'll get that straightened out.

@lyoshenka
Copy link
Member

all fixed

@flungo flungo mentioned this issue Apr 5, 2017
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Assignees

@kauffj kauffj

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

No branches or pull requests
3 participants
@lyoshenka @kauffj @sbuzonas