修复合并

starRTC/src/main/java/com/starrtc/demo/demo/service/KeepLiveService.java

@@ -100,10 +100,7 @@ public class KeepLiveService extends Service implements IEventListener {
             customConfig.setImServerUrl(MLOC.IM_SERVER_URL);
             customConfig.setVoipServerUrl(MLOC.VOIP_SERVER_URL);
             customConfig.setLogEnable(false); //关闭SDK调试日志
-<<<<<<< HEAD
-//            customConfig.setDefConfigAudioSource(XHConstants.XHAudioSourceEnum.MIC);  //音频采集使用mic
-=======
->>>>>>> 81297e18df7ba5f7b239ad69a3b62c6b979ce4a7
+
 //            customConfig.setDefConfigOpenGLESEnable(false);
 //            customConfig.setDefConfigCameraId(1);//设置默认摄像头方向  0后置  1前置
 //            customConfig.setDefConfigVideoSize(XHConstants.XHCropTypeEnum.STAR_VIDEO_CONFIG_360BW_640BH_180SW_320SH);