소스 검색

Removed merge conflict

Daniel Gibbs 10 년 전
부모
커밋
a4ff32b29f
1개의 변경된 파일0개의 추가작업 그리고 4개의 파일을 삭제
  1. 0 4
      functions/core_functions.sh

+ 0 - 4
functions/core_functions.sh

@@ -2,11 +2,7 @@
 # LGSM core_functions.sh function
 # Author: Daniel Gibbs
 # Website: http://gameservermanagers.com
-<<<<<<< HEAD
-lgsm_version="190216"
-=======
 lgsm_version="270216"
->>>>>>> dlmanage
 
 # Description: Defines all functions to allow download and execution of functions using fn_fetch_function.
 # This function is called first before any other function. Without this file other functions would not load.