[ https://issues.apache.org/jira/browse/FLAGON-392?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ]
Joshua Poore resolved FLAGON-392. --------------------------------- Resolution: Fixed > Clean up for Merge with master > ------------------------------ > > Key: FLAGON-392 > URL: https://issues.apache.org/jira/browse/FLAGON-392 > Project: Flagon > Issue Type: Task > Components: UserALE.js > Affects Versions: UserALE.js 2.0.0 > Reporter: Joshua Poore > Assignee: Joshua Poore > Priority: Major > Fix For: UserALE.js 2.0.0 > > > Fix the following content conflicts prior to 2.0.0 release: > > You have unmerged paths. > (fix conflicts and run "git commit") > (use "git merge --abort" to abort the merge) > > Changes to be committed: > > modified: .babelrc > modified: DISCLAIMER > modified: NOTICE > new file: build/UserAleWebExtension/background.js > new file: build/UserAleWebExtension/content.js > new file: build/UserAleWebExtension/icons/border-48.png > new file: build/UserAleWebExtension/manifest.json > new file: build/UserAleWebExtension/options.js > new file: build/UserAleWebExtension/optionsPage.html > deleted: build/userale-1.0.0.min.js > renamed: build/userale-1.0.0.js -> build/userale-2.0.0.js > new file: build/userale-2.0.0.min.js > modified: example/README.md > new file: src/UserALEWebExtension/README.md > new file: src/UserALEWebExtension/background.js > new file: src/UserALEWebExtension/content.js > new file: src/UserALEWebExtension/globals.js > new file: src/UserALEWebExtension/icons/border-48.png > new file: src/UserALEWebExtension/manifest.json > new file: src/UserALEWebExtension/messageTypes.js > new file: src/UserALEWebExtension/options.js > new file: src/UserALEWebExtension/optionsPage.html > new file: src/UserALEWebExtension/public/index.html > modified: src/attachHandlers.js > modified: src/getInitialSettings.js > modified: src/main.js > modified: src/packageLogs.js > modified: src/sendLogs.js > modified: test/attachHandlers_spec.js > modified: test/packageLogs_spec.js > modified: test/sendLogs_spec.js > > Unmerged paths: > (use "git add <file>..." to mark resolution) > > both modified: LICENSE > both modified: README.md > both modified: doap-userale.js.rdf > both modified: example/index.html > both modified: gulpfile.js > both added: package-lock.json > both modified: package.json > both modified: test/main_spec.js > > MacBook-Pro:incubator-flagon-useralejs jpoore$ -- This message was sent by Atlassian JIRA (v7.6.3#76005)