Skip to content

Commit

Permalink
fix conflict
Browse files Browse the repository at this point in the history
  • Loading branch information
@eitoball
eitoball committed Aug 3, 2024
1 parent e560bdd commit 929a1dd
Showing 1 changed file with 0 additions and 4 deletions.
4 changes: 0 additions & 4 deletions Dockerfile.grafana
View file
Original file line number Diff line number Diff line change
@@ -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 && \
Expand Down

0 comments on commit 929a1dd

Please sign in to comment.