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

Broken patch #1

Open

fdietze opened this issue Jun 1, 2022 · 0 comments

Owner

fdietze commented Jun 1, 2022 •

edited

Loading

<<<<<<< HEAD

addSbtPlugin("com.thoughtworks.sbt-scala-js-map" % "sbt-scala-js-map" % "4.1.1")
||||||| parent of 79966da (Add Scoverage Plugin)
=======


addSbtPlugin("org.scoverage" % "sbt-scoverage" % "1.9.2")
>>>>>>> 79966da (Add Scoverage Plugin)

produces:

dSbtPlugin("org.scoverage" % "sbt-scoverage" % "1.9.2")
����
addSbtPlugin("com.thoughtworks.sbt-scala-js-map" % "sbt-scala-js-map" % "4.1.1")

minimal example:

<<<<<<< HEAD
hello
||||||| parent
=======
hello
>>>>>>> 79966da

The text was updated successfully, but these errors were encountered:

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