From d793ef1ab86b9c8a0ccd5933cb178731d2ec691b Mon Sep 17 00:00:00 2001
From: bcambl <blayne@blaynecampbell.com>
Date: Sat, 6 Jul 2019 10:57:57 -0600
Subject: [PATCH] Merge conflict Fedora Dockerfile for tests pinned to 30

Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
---
 test/fedora.Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/fedora.Dockerfile b/test/fedora.Dockerfile
index c4834388..a06fc007 100644
--- a/test/fedora.Dockerfile
+++ b/test/fedora.Dockerfile
@@ -1,4 +1,4 @@
-FROM fedora:latest
+FROM fedora:30
 
 ENV GITDIR /etc/.pihole
 ENV SCRIPTDIR /opt/pihole