fix some issues after "merging" 7.6 into master

- Tests: resolve merge conflict
2024-11-23 20:36:33 +01:00 · 2019-02-09 11:49:58 +01:00 · 2019-02-09 11:49:58 +01:00 · 13951af9df
commit 13951af9df
parent 075a9fa066
1 changed files with 0 additions and 6 deletions
--- a/XenAdminTests/WizardTests/WizardTest.cs
+++ b/XenAdminTests/WizardTests/WizardTest.cs
@ -101,13 +101,7 @@ namespace XenAdminTests.WizardTests
                });
        }

-<<<<<<< .mine
-        [Test, MaxTime(100 * 1000)]
-        public void RunWizardTests()
-=======
        private void SetUp()
-
->>>>>>> .theirs
        {
            RunBefore();