From b8c48c0c55f7ff0c7103cc5d0555f8ce090b79fc Mon Sep 17 00:00:00 2001
From: Brian Osman <brianosman@google.com>
Date: Wed, 26 Oct 2016 09:32:52 -0400
Subject: Remove skia.conf from .gitignore

BUG=skia:

GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=3962

Change-Id: I2b4d9afda4a5cb393a52f34070ede03da170ee74
Reviewed-on: https://skia-review.googlesource.com/3962
Reviewed-by: Brian Salomon <bsalomon@google.com>
Commit-Queue: Brian Osman <brianosman@google.com>
---
 .gitignore | 1 -
 1 file changed, 1 deletion(-)

(limited to '.gitignore')

diff --git a/.gitignore b/.gitignore
index fd9145052a..9d489d6707 100644
--- a/.gitignore
+++ b/.gitignore
@@ -29,7 +29,6 @@ platform_tools/android/apps/*/build
 platform_tools/android/apps/*/src/main/libs
 sampleapp_prefs.txt
 /skps
-skia.conf
 third_party/externals
 tools/skp/page_sets/data/*.json
 tools/skp/page_sets/data/*.wpr
-- 
cgit v1.2.3