RESOLVED build errors

2020-11-24 18:49:41 +05:30
parent 87105d77cf
commit 56db8f4915
74 changed files with 265 additions and 2350 deletions
@@ -25,11 +25,8 @@
 	<htmlTabName>Test-10MHz</htmlTabName>
 	<htmlTabIcon>tasks</htmlTabIcon>
 	<repeatCount>2</repeatCount>
-<<<<<<< HEAD
-=======
 	<TestUnstable>True</TestUnstable>
 	<TestMinId>040612</TestMinId>
->>>>>>> fork_develop_new
 	<TestCaseRequestedList>
 030201
 040101