Ján Jamrich
committed
on 23 Jan 12
RF-10197: fix merge problems

Following files modifies:
modified: application/src/main/webapp/components/richFileUpload/list.xhtml (remov… Show more
RF-10197: fix merge problems

Following files modifies:

        modified:   application/src/main/webapp/components/richFileUpload/list.xhtml (removed MERGE CONFLICT mark)

        deleted:    application/src/main/webapp/resources/script/push.js (this file was renamed to pushHelper.js)

        deleted:    notes (no longer needed) Show less