From a64d8bb40acfb7ef0a4d4b94b604e5f6978fea75 Mon Sep 17 00:00:00 2001
From: Colin Lyons <colin@tercet.io>
Date: Wed, 28 Dec 2022 12:29:14 +0000
Subject: [PATCH] Patching merge conflict.

---
 docker/sim/client.go | 14 --------------
 1 file changed, 14 deletions(-)

diff --git a/docker/sim/client.go b/docker/sim/client.go
index a4a4f50f..9a679ab0 100644
--- a/docker/sim/client.go
+++ b/docker/sim/client.go
@@ -3,7 +3,6 @@
 package main
 
 import (
-<<<<<<<< HEAD:docker/sim/client.go
 	"bytes"
 	"context"
 	"encoding/base64"
@@ -131,16 +130,3 @@ func (cli *Client) PushTags(opts types.ImagePushOptions) (err error) {
 
 	return nil
 }
-========
-	"github.com/docker/docker/client"
-)
-
-func createNetworkIfNotExists(cli *client.Client) (err error) {
-
-	//ctx, cancel := context.WithTimeout(context.Background(), time.Second * 120)
-	//defer cancel()
-
-	//cli.NetworkCreate(ctx, "indranet")
-	return
-}
->>>>>>>> main:docker/sim/utils.go