fixed conflict

core/function-impl/mogo-core-function-bindingcar/src/main/java/com/mogo/eagle/core/function/bindingcar/BindingcarProvider.java

@@ -1,6 +1,7 @@
 package com.mogo.eagle.core.function.bindingcar;
 
 import android.content.Context;
+import android.util.Log;
 
 import com.alibaba.android.arouter.facade.annotation.Route;
 import com.mogo.eagle.core.data.config.FunctionBuildConfig;
@@ -57,6 +58,7 @@ public class BindingcarProvider implements IMoGoBindingcarProvider {
      */
     @Override
     public void getBindingcarInfo(String macAddress, String widevineIDWithMd5) {
+        Log.d("Upgrade", "getBindingcarInfo macAddress = " + macAddress + "--widevineIDWithMd5 = " + widevineIDWithMd5);
         mAddress = macAddress;
         mWidevineIDWithMd5 = widevineIDWithMd5;
         if (getScreenType() == 1) { //司机屏