search

smashwilson / merge-conflicts

Resolve git merge conflicts in Atom
https://atom.io/packages/merge-conflicts
MIT License
432 stars 42 forks source link

Fixes deprecation call to assign custom properties to a marker #262 #265

Closed dbachko closed 7 years ago

dbachko commented 7 years ago

Persistent property was removed in Atom v1.9.0 and it generates deprecation warnings.

smashwilson commented 7 years ago

Looks like the test failures are due to good, old-fashioned code rot. :shipit: