Changelog for #1831

JonRowe · yujinakayama · commit c05f9a89937d · 2017-07-25T13:00:40.000+09:00
diff --git a/Changelog.md b/Changelog.md
@@ -1,6 +1,12 @@
 ### Development
 
 Bug Fixes:
+<<<<<<< HEAD
+=======
+
+* Prevent "template not rendered" log message from erroring in threaded
+  environments. (Samuel Cochran, #1831)
+>>>>>>> ac759a36... Changelog for #1831
 * Correctly generate job name in error message. (Wojciech Wnętrzak, #1814)
 
 ### 3.6.0 / 2017-05-04
