diff --git a/.gitignore b/.gitignore index e2c7385..c340c84 100644 --- a/.gitignore +++ b/.gitignore @@ -11,9 +11,4 @@ tests todo.txt LICENCE tokens.json -<<<<<<< Updated upstream -.vscode -cosmos_gray.png -======= -cosmos_gray.png ->>>>>>> Stashed changes +.vscode \ No newline at end of file diff --git a/client/src/assets/images/icons/cosmos_gray.png b/client/src/assets/images/icons/cosmos_gray.png new file mode 100644 index 0000000..bd000d6 Binary files /dev/null and b/client/src/assets/images/icons/cosmos_gray.png differ diff --git a/cosmos_gray.png b/cosmos_gray.png new file mode 100644 index 0000000..bd000d6 Binary files /dev/null and b/cosmos_gray.png differ diff --git a/dockerfile b/dockerfile index cf976de..208ecd1 100644 --- a/dockerfile +++ b/dockerfile @@ -12,6 +12,7 @@ WORKDIR /app COPY build/cosmos . COPY build/cosmos_gray.png . +COPY cosmos_gray.png . COPY build/meta.json . COPY static ./static