8 +<<<<<<< TREE 9 include lava_android_test/test_definitions/usbhardware/* 10 +======= 11 +include lava_android_test/test_definitions/pm-qa/* 12 +>>>>>>> MERGE-SOURCE
There in conflict in the diff.
And because I don't have the image that pm-qa integrated, so I can't try it in my local. could you show the output of "lava-android-test run pm-qa"
« Back to merge proposal
8 +<<<<<<< TREE test/test_ definitions/ usbhardware/ * test/test_ definitions/ pm-qa/*
9 include lava_android_
10 +=======
11 +include lava_android_
12 +>>>>>>> MERGE-SOURCE
There in conflict in the diff.
And because I don't have the image that pm-qa integrated, so I can't try it in my local.
could you show the output of "lava-android-test run pm-qa"