Skip to content
Permalink
Browse files
error fixing conflict
  • Loading branch information
ralsina committed Aug 15, 2015
1 parent afe54c0 commit baf8737a46b3ad98e5d25253c651a6b70d4c63be
Showing with 2 additions and 2 deletions.
  1. +2 −2 nikola/nikola.py
@@ -707,12 +707,12 @@ def __init__(self, **config):
pp_exts = set([os.path.splitext(x[0])[1] for x in self.config['post_pages']])
self.config['COMPILERS'] = {}
self.disabled_compilers = {}
bad_compilers = set([])
self.bad_compilers = set([])
for k, v in compilers.items():
if pp_exts.intersection(v):
self.config['COMPILERS'][k] = sorted(list(v))
else:
bad_compilers.add(k)
self.bad_compilers.add(k)

self._set_global_context()
self._init_plugins()

0 comments on commit baf8737

Please sign in to comment.