From 71f16c1baef3a610d4a7704b0b06fbb05467c8c8 Mon Sep 17 00:00:00 2001
From: Anton Livaja <anton@livaja.me>
Date: Mon, 3 Feb 2025 23:10:03 -0500
Subject: [PATCH] fix casing for oci directive

---
 Containerfile | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/Containerfile b/Containerfile
index 4b0ab9b..4220e14 100644
--- a/Containerfile
+++ b/Containerfile
@@ -73,6 +73,7 @@ COPY --from=user-cpio . /
 COPY --from=user-mtools . /
 COPY --from=user-grub . /
 
+<<<<<<< HEAD
 FROM base as dev
 COPY --from=core-gcc . /
 COPY --from=core-zlib . /
@@ -96,6 +97,30 @@ COPY --from=core-curl . /
 COPY --from=user-libtpms . /
 COPY --from=user-tpm2-tss . /
 COPY --from=user-tpm2-tools . /
+=======
+FROM base AS dev
+COPY --from=gcc . /
+COPY --from=glib . /
+COPY --from=alsa-lib . /
+COPY --from=lzo . /
+COPY --from=dtc . /
+COPY --from=zlib . /
+COPY --from=numactl . /
+COPY --from=libaio . /
+COPY --from=libseccomp . /
+COPY --from=libffi . /
+COPY --from=libzstd . /
+COPY --from=libslirp . /
+COPY --from=seabios . /
+COPY --from=ipxe . /
+COPY --from=qemu . /
+COPY --from=swtpm . /
+COPY --from=openssl . /
+COPY --from=curl . /
+COPY --from=libtpms . /
+COPY --from=tpm2-tss . /
+COPY --from=tpm2-tools . /
+>>>>>>> 30df221 (fix casing for oci directive)
 
 FROM base AS build