fix conflict in wwan test plan

canonical · Sep 27, 2024 · 8d8dae8 · 8d8dae8
1 parent 5b92d2d
commit 8d8dae8
Showing 1 changed file with 0 additions and 6 deletions.
diff --git a/providers/base/units/wwan/test-plan.pxu b/providers/base/units/wwan/test-plan.pxu
@@ -26,7 +26,6 @@ include:
 >>>>>>> update the test case and scripts
 bootstrap_include:
     wwan_resource
-    wwan_resource_with_iteration
 
 id: after-suspend-wwan-full
 unit: test plan
@@ -43,14 +42,9 @@ _name: Automated wwan tests (after suspend)
 _description: Automated wwan tests for Snappy Ubuntu Core devices
 include:
     after-suspend-wwan/detect
-<<<<<<< HEAD
     after-suspend-wwan/check-sim-present-manufacturer-model-hw_id-auto
     after-suspend-wwan/3gpp-scan-manufacturer-model-hw_id-auto
-    after-suspend-wwan/gsm-connection-.*-auto
-=======
     after-suspend-wwan/gsm-connection-manufacturer-model-hw_id-auto
-    after-suspend-wwan/check-sim-present-manufacturer-model-hw_id-auto
->>>>>>> update the test case and scripts
 bootstrap_include:
     wwan_resource