fixmerge

Dockerfile.lite

@@ -12,16 +12,9 @@ WORKDIR /ygopro-server
 RUN npm ci && \
     mkdir config decks replays logs
 
-<<<<<<< HEAD
-# ygopro
-RUN git clone --branch=server --recursive --depth=1 https://github.com/purerosefallen/ygopro /ygopro-server/ygopro
-WORKDIR /ygopro-server/ygopro
-RUN git submodule foreach git checkout master && \
-=======
-RUN git clone --branch=server --recursive --depth=1 https://github.com/moecube/ygopro && \
+RUN git clone --branch=server --recursive --depth=1 https://github.com/purerosefallen/ygopro && \
     cd ygopro && \
     git submodule foreach git checkout master && \
->>>>>>> mc
     wget -O - https://github.com/premake/premake-core/releases/download/v5.0.0-alpha13/premake-5.0.0-alpha13-linux.tar.gz | tar zfx - && \
     ./premake5 gmake && \
     cd build && \