resolve merge conflict
authorpembemiriam <pembemiriam007@gmail.com>
Wed, 24 Oct 2018 08:48:22 +0000 (09:48 +0100)
committerpembemiriam <pembemiriam007@gmail.com>
Wed, 24 Oct 2018 08:48:22 +0000 (09:48 +0100)
commitcd51964a6c4fa1644e84d3603e6001ff5b4340c8
tree90e2e88b3a88f0d22c2156310119b869ebc3a679
parentcef8266b273c65b79c8285128782c9a82a9b4475
resolve merge conflict
src/app/centers/form/form.component.ts
src/app/collection/collection.component.ts