Skip to content

lang files have a git merge conflict. Interferes with cauldron chat #26

Description

@CoryManson

Hello Eximius,

Your en_US.lang files are showing a git merge conflict. Cauldron servers identify this conflict and put a prefix in chat that cannot be removed (See: https://i.imgur.com/UWkvEpE.png). Resolving the conflict or deleting the offending lines fixes the issue.

http://git-scm.com/book/en/v2/Git-Branching-Basic-Branching-and-Merging#Basic-Merge-Conflicts

Offending line:

https://github.com/Eximius88/ModularPowersuitsAddons/blob/1.7.10/src/main/resources/assets/powersuitaddons/lang/en_US.lang#L11

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

    No labels
    No labels

    Projects

    No projects

      Milestone

      No milestone

      Relationships

      None yet

      Development

      No branches or pull requests

      Issue actions