解决冲突

ec0dcaed · hanfeng · 397f239f · ec0dcaed
Commit ec0dcaed authored Jul 06, 2019 by hanfeng
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 4 deletions

RedisKey.java ...n/java/com/xxfc/platform/universal/constant/RedisKey.java +1 -4

No files found.
--- a/xx-universal/xx-universal-api/src/main/java/com/xxfc/platform/universal/constant/RedisKey.java
+++ b/xx-universal/xx-universal-api/src/main/java/com/xxfc/platform/universal/constant/RedisKey.java
-<<<<<<< .mine
-package com.xxfc.platform.universal.constant;
-=======
 package com.xxfc.platform.universal.constant;
->>>>>>> .theirs
 public class RedisKey {
    /**