From d5466621070c700efa1432df553f66b291fafc60 Mon Sep 17 00:00:00 2001
From: Ani <aniongithub@users.noreply.github.com>
Date: Tue, 6 Oct 2020 02:58:18 -0700
Subject: [PATCH] Automagically use i386/debian:buster (#415)

* Autmagically use 1386/debian:buster when running on 64-bit host to prevent error #271
---
 Dockerfile | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Dockerfile b/Dockerfile
index 906ea1f401..97ee1c7bb2 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 ARG BASE_IMAGE=debian:bullseye
 FROM ${BASE_IMAGE}