diff --git a/QXLive/Other/QXApi.h b/QXLive/Other/QXApi.h
index 76af2e4..5d514ca 100644
--- a/QXLive/Other/QXApi.h
+++ b/QXLive/Other/QXApi.h
@@ -24,10 +24,6 @@ static NSString* H5ServerUrl = @"https://test.vespa.qxyushen.top/h5/";
 //static NSString* H5ServerUrl = @"https://vespa.qxyushen.top/h5/";
 static NSString* ServerUrl = @"https://yushengapi.qxyushen.top/";
 static NSString* H5ServerUrl = @"https://yushengapi.qxyushen.top/h5/";
-<<<<<<< HEAD
-
-=======
->>>>>>> dev
 #endif
 #pragma mark - 引导页
 /// 引导页