resolve conficts

Tests/Regression/Manager/Logs/macos-latest_3.10/report.html

@@ -1629,7 +1629,7 @@
 window.output = {};
 </script>
 <script type="text/javascript">
-window.output["suite"] = [1,2,3,0,[],[0,0,1240729],[[4,5,6,0,[],[1,26,17515],[],[[7,0,8,[9,10,11],[1,41,3004],[]],[12,0,0,[9,10,11],[1,3045,13618],[]],[13,0,0,[9,10,11],[1,16663,877],[]]],[],[3,3,0,0]],[14,15,16,0,[],[0,17542,1223185],[],[[17,0,0,[9],[1,26487,10315],[]],[18,0,0,[9,10,11],[0,36802,300714,19],[]],[20,0,0,[9,10,11],[0,337516,300449,21],[]],[22,0,0,[9,10,11],[0,637965,301409,23],[]],[24,0,0,[9,10,11],[0,939375,300672,25],[]],[26,0,0,[9],[0,1240048,679,27],[]]],[],[6,1,5,0]]],[],[],[9,4,5,0]];
+window.output["suite"] = [1,2,3,0,[],[0,0,1273823],[[4,5,6,0,[],[1,30,50618],[],[[7,0,8,[9,10,11],[1,48,38026],[]],[12,0,0,[9,10,11],[1,38074,11658],[]],[13,0,0,[9,10,11],[1,49732,915],[]]],[],[3,3,0,0]],[14,15,16,0,[],[0,50649,1223172],[],[[17,0,0,[9],[1,60128,10458],[]],[18,0,0,[9,10,11],[0,70587,300805,19],[]],[20,0,0,[9,10,11],[0,371392,300675,21],[]],[22,0,0,[9,10,11],[0,672068,300605,23],[]],[24,0,0,[9,10,11],[0,972673,300397,25],[]],[26,0,0,[9],[0,1273070,750,27],[]]],[],[6,1,5,0]]],[],[],[9,4,5,0]];
 </script>
 <script type="text/javascript">
 window.output["strings"] = [];
@@ -1638,13 +1638,13 @@
 window.output["strings"] = window.output["strings"].concat(["*","*Manager","*/Users/runner/work/rfswarm/rfswarm/Tests/Regression/Manager","*../..","*CommandLine","*/Users/runner/work/rfswarm/rfswarm/Tests/Regression/Manager/CommandLine.robot","*../../CommandLine.robot","*Random Offset","*<p>This just prevents all the test runners doing git push at the same time\x3c/p>","*macos-latest","*ubuntu-latest","*windows-latest","*Manager Version","*Manager Help","*GUI Basic","*/Users/runner/work/rfswarm/rfswarm/Tests/Regression/Manager/GUI_Basic.robot","*../../GUI_Basic.robot","*Open GUI","*Select Run Tab","*ImageNotFoundException: Reference image \"/Users/runner/work/rfswarm/rfswarm/Tests/Regression/Manager/Images/file_method/manager_macos_tab_run.png\" was not found on screen","*Select Agents Tab","*ImageNotFoundException: Reference image \"/Users/runner/work/rfswarm/rfswarm/Tests/Regression/Manager/Images/file_method/manager_macos_tab_agents.png\" was not found on screen","*Select About Tab","*ImageNotFoundException: Reference image \"/Users/runner/work/rfswarm/rfswarm/Tests/Regression/Manager/Images/file_method/manager_macos_tab_about.png\" was not found on screen","*Select Plan Tab","*ImageNotFoundException: Reference image \"/Users/runner/work/rfswarm/rfswarm/Tests/Regression/Manager/Images/file_method/manager_macos_tab_plan.png\" was not found on screen","*Close GUI","*ImageNotFoundException: Reference image \"/Users/runner/work/rfswarm/rfswarm/Tests/Regression/Manager/Images/file_method/manager_macos_button_closewindow.png\" was not found on screen"]);
 </script>
 <script type="text/javascript">
-window.output["stats"] = [[{"elapsed":"00:20:32","fail":5,"label":"All Tests","pass":4,"skip":0}],[{"elapsed":"00:20:32","fail":5,"label":"macos-latest","pass":4,"skip":0},{"elapsed":"00:20:21","fail":4,"label":"ubuntu-latest","pass":3,"skip":0},{"elapsed":"00:20:21","fail":4,"label":"windows-latest","pass":3,"skip":0}],[{"elapsed":"00:20:41","fail":5,"id":"s1","label":"Manager","name":"Manager","pass":4,"skip":0},{"elapsed":"00:00:18","fail":0,"id":"s1-s1","label":"Manager.CommandLine","name":"CommandLine","pass":3,"skip":0},{"elapsed":"00:20:23","fail":5,"id":"s1-s2","label":"Manager.GUI Basic","name":"GUI Basic","pass":1,"skip":0}]];
+window.output["stats"] = [[{"elapsed":"00:21:04","fail":5,"label":"All Tests","pass":4,"skip":0}],[{"elapsed":"00:21:04","fail":5,"label":"macos-latest","pass":4,"skip":0},{"elapsed":"00:20:53","fail":4,"label":"ubuntu-latest","pass":3,"skip":0},{"elapsed":"00:20:53","fail":4,"label":"windows-latest","pass":3,"skip":0}],[{"elapsed":"00:21:14","fail":5,"id":"s1","label":"Manager","name":"Manager","pass":4,"skip":0},{"elapsed":"00:00:51","fail":0,"id":"s1-s1","label":"Manager.CommandLine","name":"CommandLine","pass":3,"skip":0},{"elapsed":"00:20:23","fail":5,"id":"s1-s2","label":"Manager.GUI Basic","name":"GUI Basic","pass":1,"skip":0}]];
 </script>
 <script type="text/javascript">
-window.output["baseMillis"] = 1691143908263;
+window.output["baseMillis"] = 1691204303538;
 </script>
 <script type="text/javascript">
-window.output["generated"] = 1240752;
+window.output["generated"] = 1273871;
 </script>
 <script type="text/javascript">
 window.output["expand_keywords"] = null;
@@ -2459,4 +2459,4 @@ <h3>Patterns</h3>
 </script>
 
 </body>
-</html>
+</html>