From 95c4bf4cfad9db764a4f463b7daba6f6278c0a43 Mon Sep 17 00:00:00 2001
From: Sam <sam.saffron@gmail.com>
Date: Fri, 20 Dec 2013 18:14:39 +1100
Subject: [PATCH] ignore custom conf files

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

diff --git a/.gitignore b/.gitignore
index b06ef0f02..705ef2dfa 100644
--- a/.gitignore
+++ b/.gitignore
@@ -24,6 +24,7 @@ public/plugins/*
 /public/assets/*
 
 config/discourse.pill
+config/discourse.conf
 
 # Ignore the default SQLite database and db dumps
 /db/*.sqlite3