resolved conflicts

1 year ago · f90522dfa0
parent c355759e0a
commit f90522dfa0
1 changed files with 0 additions and 1 deletions
--- a/infra/common/src/test/java/cn/hippo4j/common/toolkit/JSONUtilTest.java
+++ b/infra/common/src/test/java/cn/hippo4j/common/toolkit/JSONUtilTest.java
@ -14,7 +14,6 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
-
 package cn.hippo4j.common.toolkit;

 <<<<<<< HEAD:infra/common/src/test/java/cn/hippo4j/common/toolkit/JSONUtilTest.java