From 3f0db5469e2d468fefa9ef7bdca8a295db2e538e Mon Sep 17 00:00:00 2001
From: Takeshi KOMIYA <i.tkomiya@gmail.com>
Date: Wed, 14 Dec 2016 00:37:16 +0900
Subject: [PATCH] Fix miss-merging

---
 sphinx/environment/__init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sphinx/environment/__init__.py b/sphinx/environment/__init__.py
index 4473b801d..ecd8230d2 100644
--- a/sphinx/environment/__init__.py
+++ b/sphinx/environment/__init__.py
@@ -427,7 +427,7 @@ class BuildEnvironment(object):
             enc_rel_fn = rel_fn.encode(sys.getfilesystemencoding())
             return rel_fn, path.abspath(path.join(self.srcdir, enc_rel_fn))
 
-    def find_files(self, config):
+    def find_files(self, config, buildername):
         # type: (Config, unicode) -> None
         """Find all source files in the source dir and put them in
         self.found_docs.