From 8fc18458c2e6623f8ebbcfd6cc08e5f64f116f90 Mon Sep 17 00:00:00 2001
From: Chopper711 <liushuai711@gmail.com>
Date: Sun, 29 Jan 2023 10:02:44 +0800
Subject: [PATCH] =?UTF-8?q?=E5=86=B2=E7=AA=81=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/connect/config/AuthConfig.java    |  4 ---
 .../serviceimpl/SeckillApplyServiceImpl.java  |  4 ---
 .../serviceimpl/SeckillServiceImpl.java       |  4 ---
 xxl-job/XXLJOB-README.md                      | 36 -------------------
 4 files changed, 48 deletions(-)

diff --git a/framework/src/main/java/cn/lili/modules/connect/config/AuthConfig.java b/framework/src/main/java/cn/lili/modules/connect/config/AuthConfig.java
index 4378893c..b75b1e5a 100644
--- a/framework/src/main/java/cn/lili/modules/connect/config/AuthConfig.java
+++ b/framework/src/main/java/cn/lili/modules/connect/config/AuthConfig.java
@@ -77,11 +77,7 @@ public class AuthConfig {
     /**
      * 针对国外服务可以单独设置代理
      * HttpConfig config = new HttpConfig();
-<<<<<<< HEAD
-     * config.setProxy(new Proxy(Proxy.Type.HTTP, new InetSocketAddress("106.124.130.167", 10080)));
-=======
      * config.setProxy(new Proxy(Proxy.Type.HTTP, new InetSocketAddress("127.0.0.1", 10080)));
->>>>>>> ae0c4aea12996d3d72eca7c6ccdc97922373e4d7
      * config.setTimeout(15000);
      *
      * @since 1.15.5
diff --git a/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/SeckillApplyServiceImpl.java b/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/SeckillApplyServiceImpl.java
index e28262f7..728b3e74 100644
--- a/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/SeckillApplyServiceImpl.java
+++ b/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/SeckillApplyServiceImpl.java
@@ -257,10 +257,6 @@ public class SeckillApplyServiceImpl extends ServiceImpl<SeckillApplyMapper, Sec
     }
 
     /**
-<<<<<<< HEAD
-=======
-<<<<<<< HEAD
->>>>>>> origin/master
      * 更新秒杀活动时间
      *
      * @param seckill 秒杀活动
diff --git a/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/SeckillServiceImpl.java b/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/SeckillServiceImpl.java
index 14a386f7..73293f9f 100644
--- a/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/SeckillServiceImpl.java
+++ b/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/SeckillServiceImpl.java
@@ -135,10 +135,6 @@ public class SeckillServiceImpl extends AbstractPromotionsServiceImpl<SeckillMap
     }
 
     /**
-     * <<<<<<< HEAD
-     * =======
-     * <<<<<<< HEAD
-     * >>>>>>> origin/master
      * 通用促销更新
      * 调用顺序:
      * 1. checkStatus 检查促销状态
diff --git a/xxl-job/XXLJOB-README.md b/xxl-job/XXLJOB-README.md
index c16125db..755554ca 100644
--- a/xxl-job/XXLJOB-README.md
+++ b/xxl-job/XXLJOB-README.md
@@ -1,40 +1,4 @@
-<<<<<<< HEAD
-=======
-<p align="center" >
-    <img src="https://www.xuxueli.com/doc/static/xxl-job/images/xxl-logo.jpg" width="150">
-    <h3 align="center">XXL-JOB</h3>
-    <p align="center">
-        XXL-JOB, a distributed task scheduling framework.
-        <br>
-        <a href="https://www.xuxueli.com/xxl-job/"><strong>-- Home Page --</strong></a>
-        <br>
-        <br>
-        <a href="https://github.com/xuxueli/xxl-job/actions">
-            <img src="https://github.com/xuxueli/xxl-job/workflows/Java%20CI/badge.svg" >
-        </a>
-        <a href="https://maven-badges.herokuapp.com/maven-central/com.xuxueli/xxl-job/">
-            <img src="https://maven-badges.herokuapp.com/maven-central/com.xuxueli/xxl-job/badge.svg" >
-        </a>
-        <a href="https://github.com/xuxueli/xxl-job/releases">
-         <img src="https://img.shields.io/github/release/xuxueli/xxl-job.svg" >
-        </a>
-        <a href="https://github.com/xuxueli/xxl-job/">
-            <img src="https://img.shields.io/github/stars/xuxueli/xxl-job" >
-        </a>
-        <a href="https://hub.docker.com/r/xuxueli/xxl-job-admin/">
-            <img src="https://img.shields.io/docker/pulls/xuxueli/xxl-job-admin" >
-        </a>
-        <a href="http://www.gnu.org/licenses/gpl-3.0.html">
-         <img src="https://img.shields.io/badge/license-GPLv3-blue.svg" >
-        </a>
-        <a href="https://www.xuxueli.com/page/donate.html">
-           <img src="https://img.shields.io/badge/%24-donate-ff69b4.svg?style=flat" >
-        </a>
-    </p>
-</p>
 
-
->>>>>>> ae0c4aea12996d3d72eca7c6ccdc97922373e4d7
 ## Introduction
 XXL-JOB is a distributed task scheduling framework. 
 It's core design goal is to develop quickly and learn simple, lightweight, and easy to expand.