Joshua Poore created FLAGON-392: ----------------------------------- Summary: 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 Fix For: UserALE.js 2.0.0
Fix the following content conflicts prior to 2.0.0 release: LICENSE: needs merge README.md: needs merge doap-userale.js.rdf: needs merge example/index.html: needs merge gulpfile.js: needs merge package-lock.json: needs merge package.json: needs merge test/main_spec.js: needs merge -- This message was sent by Atlassian JIRA (v7.6.3#76005)