fix merge conflict

sentry-core/src/test/java/io/sentry/core/HubTest.kt

@@ -1,5 +1,7 @@
 package io.sentry.core
 
+import com.nhaarman.mockitokotlin2.mock
+import com.nhaarman.mockitokotlin2.verify
 import io.sentry.core.protocol.User
 import kotlin.test.Test
 import kotlin.test.assertEquals
@@ -33,4 +35,14 @@ class HubTest {
         assertEquals("test", clone.tags["test"])
         assertEquals("[email protected]", clone.user.email)
     }
+
+    @Test
+    fun `when hub is initialized, integrations are registed`() {
+        val integrationMock = mock<Integration>()
+        val options = SentryOptions()
+        options.dsn = "https://[email protected]/proj"
+        options.addIntegration(integrationMock)
+        val expected = Hub(options)
+        verify(integrationMock).register(expected, options)
+    }
 }