search

smashwilson / merge-conflicts

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

Package.getStylesheetsPath is deprecated. #154

Closed pavlo-yuriychuk closed 9 years ago

pavlo-yuriychuk commented 9 years ago

Store package style sheets in the styles/ directory instead of stylesheets/ in the merge-conflicts package

Package.getStylesheetsPath (/usr/share/atom/resources/app.asar/src/package.js:460:9)
Package.getStylesheetPaths (/usr/share/atom/resources/app.asar/src/package.js:471:32)
Package.loadStylesheets (/usr/share/atom/resources/app.asar/src/package.js:453:38)
<unknown> (/usr/share/atom/resources/app.asar/src/package.js:185:19)
Package.measure (/usr/share/atom/resources/app.asar/src/package.js:165:15)
Package.load (/usr/share/atom/resources/app.asar/src/package.js:179:12)

Atom version 1.0

smashwilson commented 9 years ago

What version of merge-conflicts are you using? This was fixed in 1.3.0 (#132).