str rov model

recommend-server-service/src/main/java/com/tzld/piaoquan/recommend/server/service/score/ScorerUtils.java

@@ -28,16 +28,8 @@ public final class ScorerUtils {
     public static void warmUp() {
         log.info("scorer warm up ");
         ScorerUtils.init(BASE_CONF);
-<<<<<<< HEAD
         ScorerUtils.init(FLOWPOOL_CONF);
-
-=======
         ScorerUtils.init(VIDEO_SCORE_CONF_FOR_AD);
-<<<<<<< HEAD
->>>>>>> d4727fd (model rpc)
-=======
-
->>>>>>> 60461d5 (model rpc)
     }
 
     private ScorerUtils() {