Skip to content

"Parent of" sticks around after resolving conflict #42

Open
Open
"Parent of" sticks around after resolving conflict#42
Labels
bug

Description

@alok
alok
opened on Jul 16, 2018

The ||||| marker isn't removed when the conflict is resolved and ends up in the codebase.

Activity

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

Metadata

Metadata

Assignees

No one assigned

    Labels

    bug

    Projects

    No projects

      Milestone

      No milestone

      Relationships

      None yet

      Development

      No branches or pull requests

      Issue actions