LGTM, following conflict was resolved:
+<<<<<<< TREE 'packages': [[headers_package(), 'openvswitch-datapath-dkms'], +======= + 'packages': [[headers_package()] + determine_dkms_package(), +>>>>>>> MERGE-SOURCE
With MERGE-SOURCE being used
« Back to merge proposal
LGTM, following conflict was resolved:
+<<<<<<< TREE
' packages' : [[headers_ package( ), 'openvswitch- datapath- dkms'], package( )] + determine_ dkms_package( ),
+=======
+ 'packages': [[headers_
+>>>>>>> MERGE-SOURCE
With MERGE-SOURCE being used