From 929a1dd4e20c646b19d6067cd779114e3b8372ac Mon Sep 17 00:00:00 2001
From: Eito Katagiri <eitoball@gmail.com>
Date: Sat, 3 Aug 2024 14:06:35 +0900
Subject: [PATCH] fix conflict

---
 Dockerfile.grafana | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/Dockerfile.grafana b/Dockerfile.grafana
index 38e34ee..6af69da 100644
--- a/Dockerfile.grafana
+++ b/Dockerfile.grafana
@@ -1,8 +1,4 @@
-<<<<<<< Updated upstream
-FROM grafana/grafana:11.1
-=======
 FROM grafana/grafana:11.1.1
->>>>>>> Stashed changes
 
 RUN grafana cli plugins install petrslavotinek-carpetplot-panel && \
     grafana cli plugins install grafana-googlesheets-datasource && \