fixed merge conflict

2023-12-29 12:46:56 +01:00
parent 0812fc6c49
commit 467adf2264
1 changed files with 0 additions and 4 deletions
--- a/Frontend/Dockerfile
+++ b/Frontend/Dockerfile
@@ -1,8 +1,4 @@
-<<<<<<< HEAD
-FROM node:latest as build-stage
-=======
 FROM node:20.9.0-bullseye-slim as build-stage
->>>>>>> 307e732608fca31b60027b417412691ff0e1c2f0
 WORKDIR /app
 COPY package*.json ./
 RUN npm install