Browse Source

merge conflict again

Artur Paikin 7 years ago
parent
commit
7f122f472c
1 changed files with 0 additions and 4 deletions
  1. 0 4
      CHANGELOG.md

+ 0 - 4
CHANGELOG.md

@@ -86,10 +86,6 @@ To be released: 2017-10-27
 - [ ] core: research !important styles to be immune to any environment/page. Maybe use smth like `postcss-safe-important`. Or increase specificity (with .Uppy) (@arturi)
 - [ ] test: add https://github.com/pa11y/pa11y for automated accessibility testing (@arturi)
 - [ ] test: add tests for `npm install uppy` and running in different browsers, the real world use case (@arturi)
-<<<<<<< HEAD
-=======
-- [x] core: Uppy ID per instance (@goto-bus-stop)
->>>>>>> origin/master
 - [ ] core: allow setting custom `id` for plugins: https://github.com/transloadit/uppy/pull/328#issuecomment-328242214 (@arturi)
 - [ ] core: move `setPluginState` to Plugin class ? (@goto-bus-stop)
 - [ ] add `FormEncapsulator`: a plugin that is used in conjunction with any other acquirer, responsible for injecting any result (like from Transloadit plugin) back into the form (jquery-sdk includes the whole Assembly Status JSON in a hidden field i think)