From baa2fb0f1e8a23e319770a230f7d802474b99240 Mon Sep 17 00:00:00 2001
From: Kameron Kenny - pi501 <kkenny379@gmail.com>
Date: Sun, 20 Oct 2024 14:05:17 -0400
Subject: [PATCH] image

---
 docker-compose.yml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/docker-compose.yml b/docker-compose.yml
index 2888e96..acb1376 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -18,7 +18,11 @@ services:
     container_name: ns1
     build:
       dockerfile: Dockerfile.primary
+<<<<<<< HEAD
     image: docker-registry1.in.thelinuxpro.net:5000/tlp/bind9-primary:240915.1.1
+=======
+    image: docker-registry1.in.thelinuxpro.net:5000/tlp/bind9-primary:240625.1.1
+>>>>>>> 94cf43d (image)
     restart: always
     user: root
     environment: