fix merging problem

3 years ago · d4fe5908f5
parent af838d62e8
commit d4fe5908f5
2 changed files with 3 additions and 1 deletions
--- a/3
+++ b/3
@ -10,6 +10,9 @@ COPY . .
 RUN npm install
 RUN npm run build
 # Remove built tools
 RUN apk del make g++
 EXPOSE 3001
 VOLUME ["/app/data"]
 CMD ["npm", "run", "start-server"]
--- a/server/notification.js
+++ b/server/notification.js
@ -92,7 +92,6 @@ class Notification {
              console.log(error)
              return false;
            }
            return await Notification.discord(notification, msg)
        } else if (notification.type === "signal") {
          try {