add generic 2-way merge handler. - #26

Merged

openshift-merge-robot merged 3 commits into

openshift:masterfrom

abhinavdahiya:generix_handlers

Sep 28, 2018

Commits on Sep 27, 2018

vendor: update
abhinavdahiya
committed
5ff71ce

Commits on Sep 28, 2018

add generic 2-way merge handler for random types
abhinavdahiya
committed
14fab0b
handle APIService, Service objects
abhinavdahiya
committed
662e182