Merge remote-tracking branch 'remotes/origin/branch-4.5'

Conflicts:
	sonar-plugin-api/src/test/java/org/sonar/api/utils/HttpDownloaderTest.java

1 files changed, 2 insertions, 6 deletions

diff --git a/sonar-plugin-api/src/test/java/org/sonar/api/utils/HttpDownloaderTest.java b/sonar-plugin-api/src/test/java/org/sonar/api/utils/HttpDownloaderTest.java
index 023adfde926..6380b849dbd 100644
--- a/sonar-plugin-api/src/test/java/org/sonar/api/utils/HttpDownloaderTest.java
+++ b/sonar-plugin-api/src/test/java/org/sonar/api/utils/HttpDownloaderTest.java
@@ -58,17 +58,13 @@ import static org.mockito.Mockito.when;
 public class HttpDownloaderTest {
 
   @Rule
-  public Timeout timeout = new Timeout(1000);
-
-  @Rule
   public TemporaryFolder temporaryFolder = new TemporaryFolder();
 
   @Rule
-<<<<<<< HEAD
   public ExpectedException thrown = ExpectedException.none();
-=======
+
+  @Rule
   public Timeout timeout = new Timeout(2000);
->>>>>>> remotes/origin/branch-4.5
 
   private static SocketConnection socketConnection;
   private static String baseUrl;