Fix Jenkinsfile, too! ARGL!

Jenkinsfile

@@ -40,17 +40,10 @@ node {
     def pVersion = pom.version
     def snapshot = pVersion.contains("SNAPSHOT")
     if (snapshot) {
-<<<<<<< HEAD
-        doDebSnapshot(pName, '', pVersion, 'trusty')
-    }
-    else {
-        doDebRelease(pName, '', pVersion, 'trusty')
-=======
         doDebSnapshot(pName, '', pVersion)
     }
     else {
         doDebRelease(pName, '', pVersion)
->>>>>>> release/1.9.10
     }
   }
 }