From ac15dc429d899ccf6efd055feefd160c7b2c6909 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Mon, 18 Jul 2022 22:06:31 -0700
Subject: [PATCH] df

---
 Dockerfile | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 665b9cd6d..81dc72637 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,8 +1,4 @@
-<<<<<<< HEAD
 FROM node:16.15.1-bullseye AS builder
-=======
-FROM node:18.2.0-alpine3.15 AS base
->>>>>>> thatonecalculator/yarn-3
 
 ARG NODE_ENV=production