From 40cdb2151779ec48d18aaaaf9bcd38400413943f Mon Sep 17 00:00:00 2001
From: Viko <viko@vikomprenas.com>
Date: Fri, 4 May 2018 16:14:31 -0600
Subject: [PATCH] Fix merge conflict (again? could've sworn)

---
 lib/ejs.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/ejs.js b/lib/ejs.js
index 7fe94e4d..8d08f379 100755
--- a/lib/ejs.js
+++ b/lib/ejs.js
@@ -56,8 +56,8 @@ var _NAME = 'ejs';
 var _REGEX_STRING = '(<%%|%%>|<%=|<%-|<%_|<%#|<%|%>|-%>|_%>)';
 var _OPTS_PASSABLE_WITH_DATA = ['delimiter', 'scope', 'context', 'debug', 'compileDebug',
   'client', '_with', 'rmWhitespace', 'strict', 'filename', 'async'];
-// We don't allow 'cache' option to be passed in the data obj
-// for the normal `render` call, but this is where Express puts it
+// We don't allow 'cache' option to be passed in the data obj for
+// the normal `render` call, but this is where Express 2 & 3 put it
 // so we make an exception for `renderFile`
 var _OPTS_PASSABLE_WITH_DATA_EXPRESS = _OPTS_PASSABLE_WITH_DATA.concat('cache');
 var _BOM = /^\uFEFF/;