solve merge conflict issues

2018-10-01 21:59:03 +01:00
parent 0269052d6a
commit dbb5e14e9f
10 changed files with 63 additions and 65 deletions
--- a/Tests/StencilTests/VariableSpec.swift
+++ b/Tests/StencilTests/VariableSpec.swift
@@ -351,8 +351,7 @@ class VariableTests: XCTestCase {

      func makeVariable(_ token: String) throws -> RangeVariable? {
        let token = Token.variable(value: token, at: .unknown)
-        let parser = TokenParser(tokens: [token], environment: context.environment)
-        return try RangeVariable(token.contents, parser: parser, containedIn: token)
+        return try RangeVariable(token.contents, environment: context.environment, containedIn: token)
      }

      $0.it("can resolve closed range as array") {