# HG changeset patch
# User slemonide <slemonide@gmail.com>
# Date 2015-06-29 10:41:16
# Node ID eec100b5360a9b40a1d88316cb9ccb042ebffe69
# Parent  5dc4a3a5a8510f3c11681f75ab98759b89e5b89a

fix conflict

diff --git a/neboard/settings.py b/neboard/settings.py
--- a/neboard/settings.py
+++ b/neboard/settings.py
@@ -83,7 +83,6 @@ STATICFILES_DIRS = (
 STATICFILES_FINDERS = (
     'django.contrib.staticfiles.finders.FileSystemFinder',
     'django.contrib.staticfiles.finders.AppDirectoriesFinder',
-#    'compressor.finders.CompressorFinder',
 )
 
 if DEBUG: