nit

Signed-off-by: Dhruv-J <[email protected]>
antrea-io · Dec 30, 2024 · cf6df56 · cf6df56
1 parent c3f5361
commit cf6df56
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/hack/update-codegen.sh b/hack/update-codegen.sh
@@ -48,11 +48,7 @@ fi
 function docker_run() {
   # Silence CLI suggestions.
   export DOCKER_CLI_HINTS=false
-<<<<<<< HEAD
   [ -n "$NO_PULL" ] || docker pull ${IMAGE_NAME}
-=======
-  #docker pull ${IMAGE_NAME}
->>>>>>> 5b9532f12 (don't pull image while running update codegen)
   set -x
   ANTREA_SRC_PATH="/mnt/antrea"
   # The .git directory in ANTREA_SRC_PATH must be marked as "safe".