From 069277e86f81e43e009916704fe390e38b423559 Mon Sep 17 00:00:00 2001
From: Mark Otto <markdotto@gmail.com>
Date: Tue, 5 Jan 2016 23:58:34 -0800
Subject: [PATCH] really disable the offending one

---
 scss/_custom-forms.scss | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/scss/_custom-forms.scss b/scss/_custom-forms.scss
index 2509c56521..c20e134ae0 100644
--- a/scss/_custom-forms.scss
+++ b/scss/_custom-forms.scss
@@ -204,7 +204,7 @@
   }
 }
 
-// scss-lint:disable DuplicateProperty
+// scss-lint:disable PropertyCount
 .custom-file-control {
   position: absolute;
   top: 0;
@@ -242,4 +242,4 @@
     border-radius: 0 .25rem .25rem 0;
   }
 }
-// scss-lint:enable DuplicateProperty
+// scss-lint:enable PropertyCount