Skip to content

Commit 1df3d86

Browse files
Fix bad merge
1 parent 122784f commit 1df3d86

File tree

1 file changed

+0
-4
lines changed

1 file changed

+0
-4
lines changed

.ci/metrics/Dockerfile

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,4 @@
1-
<<<<<<< HEAD
2-
FROM python:3.12
3-
=======
41
FROM docker.io/python:3.12
5-
>>>>>>> main
62

73
COPY requirements.lock.txt ./
84
RUN pip3 install --no-cache-dir -r requirements.lock.txt

0 commit comments

Comments
 (0)