Skip to content

Commit

Permalink
Fix merge.
Browse files Browse the repository at this point in the history
  • Loading branch information
dallen committed Jan 17, 2017
1 parent c07345c commit 3317b89
Showing 1 changed file with 2 additions and 0 deletions.
2 changes: 2 additions & 0 deletions .gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,3 +39,5 @@ profile.cov
/pkg/cmd/grafana-cli/grafana-cli
/pkg/cmd/grafana-server/grafana-server
/examples/*/dist

.DS_Store

0 comments on commit 3317b89

Please sign in to comment.