From a058da8b748b513a6096ee4a0ae51ea871d9f9ea Mon Sep 17 00:00:00 2001 From: Eric Huss Date: Thu, 26 Sep 2019 11:03:51 -0700 Subject: [PATCH] Fix merge conflict. --- src/renderer/html_handlebars/hbs_renderer.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/renderer/html_handlebars/hbs_renderer.rs b/src/renderer/html_handlebars/hbs_renderer.rs index ab2c75ef..b2b747a8 100644 --- a/src/renderer/html_handlebars/hbs_renderer.rs +++ b/src/renderer/html_handlebars/hbs_renderer.rs @@ -441,7 +441,7 @@ fn make_data( if html_config.playpen.editable && html_config.playpen.copy_js { data.insert("playpen_js".to_owned(), json!(true)); - if html.playpen.line_numbers { + if html_config.playpen.line_numbers { data.insert("playpen_line_numbers".to_owned(), json!(true)); } }