From 1ba5ccb159f0a60926e0d69750173e51d3f72ca0 Mon Sep 17 00:00:00 2001
From: Marcus Andersson <marcus.andersson@grafana.com>
Date: Wed, 8 Jan 2020 07:08:59 +0100
Subject: [PATCH] Build: prevent changes to pkg/extentions/main.go from
 throwing error on merge

---
 .gitignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitignore b/.gitignore
index 1a751904ab7..ef485bb1f66 100644
--- a/.gitignore
+++ b/.gitignore
@@ -61,6 +61,7 @@ profile.cov
 /pkg/cmd/grafana-server/grafana-server
 /pkg/cmd/grafana-server/debug
 /pkg/extensions
+!/pkg/extensions/main.go
 /public/app/extensions
 debug.test
 /examples/*/dist