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/ExpressionSpec.swift
+++ b/Tests/StencilTests/ExpressionSpec.swift
@@ -5,10 +5,9 @@ import Spectre
 class ExpressionsTests: XCTestCase {
  func testExpressions() {
    describe("Expression") {
-      let parser = TokenParser(tokens: [], environment: Environment())

      func parseExpression(components: [String]) throws -> Expression {
-        let parser = try IfExpressionParser.parser(components: components, tokenParser: parser, token: .text(value: "", at: .unknown))
+        let parser = try IfExpressionParser.parser(components: components, environment: Environment(), token: .text(value: "", at: .unknown))
        return try parser.parse()
      }