Conflicts manually resolved: - app/services/post_status_service.rb - config/locales/simple_form.pl.yml - config/routes.rb - config/webpack/loaders/sass.js - config/webpack/shared.js - package.json - yarn.lock |
||
|---|---|---|
| .. | ||
| assets.js | ||
| babel.js | ||
| babel_external.js | ||
| mark.js | ||
| sass.js | ||