fix merge

Signed-off-by: Bensuperpc <bensuperpc@gmail.com>

web-wasm/Dockerfile.in

@@ -1,12 +1,16 @@
+<<<<<<< HEAD
 FROM emscripten/emsdk:2.0.20
 MAINTAINER Bensuperpc "bensuperpc@gmail.com"
+=======
+FROM emscripten/emsdk:2.0.22
+MAINTAINER Matt McCormick "matt.mccormick@kitware.com"
+>>>>>>> 9adf96c16b00759a9f7f69be3e61b5e16cdd6ac4
 
 # Revert back to "/bin/sh" as default shell
 # See https://github.com/asRIA/emscripten-docker/blob/master/Dockerfile.in#L4
 RUN rm /bin/sh && ln -s /bin/dash /bin/sh
 
 ARG DEBIAN_FRONTEND=noninteractive
-ARG REPO=http://cdn-fastly.deb.debian.org
 
 RUN \
   apt-get update --yes && \
@@ -47,14 +51,17 @@ RUN \
   && \
   apt-get clean --yes
 
+<<<<<<< HEAD
 # Add symlink for compatibility
+=======
+>>>>>>> 9adf96c16b00759a9f7f69be3e61b5e16cdd6ac4
 RUN ln -s /usr/bin/python3 /usr/bin/python
 
 #include "common.dockcross"
 
 #include "common.docker"
 
-ENV EMSCRIPTEN_VERSION 2.0.4
+ENV EMSCRIPTEN_VERSION 2.0.22
 
 ENV PATH /emsdk:/emsdk/upstream/bin/:/emsdk/upstream/emscripten:${PATH}
 ENV CC=/emsdk/upstream/emscripten/emcc \