Fix unsolved conflict.

Author: zqburde

dss-appconn/linkis-appconn-engineplugin/src/main/resources/linkis-engineconn.properties

@@ -54,10 +54,4 @@ spring.spring.servlet.multipart.max-request-size=200MB
 
 wds.linkis.engineconn.support.parallelism=true
 
-wds.linkis.engineconn.max.free.time=0
-
-wds.linkis.default.computation.executormanager.clazz=org.apache.linkis.manager.engineplugin.appconn.executor.AppConnComputationExecutorManagerImpl
-=======
-
-wds.linkis.engineconn.max.free.time=0
->>>>>>> dev-1.1.4
+wds.linkis.engineconn.max.free.time=0