From 66d24988927541517c4aceb82f31e468f322d682 Mon Sep 17 00:00:00 2001
From: britkat <mark@marksweb.org.uk>
Date: Thu, 3 Feb 2022 13:11:56 +0000
Subject: [PATCH] buildx update

---
 .gitignore | 11 ++++++-----
 buildx.bat |  4 ----
 2 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/.gitignore b/.gitignore
index d4692e7d..0601d806 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,7 @@
-settings.py
-settings.old
-__pycache__
-givtcp_debug.log
+src/settings.py
+src/settings.old
+src/__pycache__
+src/givtcp_debug.log
 .venv
-.vscode
\ No newline at end of file
+.vscode
+buildx.bat
\ No newline at end of file
diff --git a/buildx.bat b/buildx.bat
index 148a8f64..64769a6b 100644
--- a/buildx.bat
+++ b/buildx.bat
@@ -1,6 +1,2 @@
-<<<<<<< HEAD
 git pull
 docker buildx build --platform linux/amd64,linux/arm64,linux/arm/v7,linux/arm/v6 -t britkat/giv_tcp-ma:latest --push .
-=======
-docker buildx build --platform linux/amd64,linux/arm64,linux/arm/v7,linux/arm/v6 -t britkat/giv_tcp-ma:refactor --push .
->>>>>>> 7234e7a915c7cbe07bdabe1b64f1f3a0964405b6