From 2e847d6b8144ceabe95a5b369d5c2bc720770fc8 Mon Sep 17 00:00:00 2001
From: Bruce Wells <brucekwells@gmail.com>
Date: Tue, 15 Jan 2019 20:12:24 -0500
Subject: Fixed merge error

---
 tests/MathTest.php | 15 +--------------
 1 file changed, 1 insertion(+), 14 deletions(-)

diff --git a/tests/MathTest.php b/tests/MathTest.php
index 09168c2..3cf4dbd 100644
--- a/tests/MathTest.php
+++ b/tests/MathTest.php
@@ -138,24 +138,11 @@ class MathTest extends \PHPUnit_Framework_TestCase
     {
         $calculator = new MathExecutor();
 
-        $calculator->addFunction('concat', function ($arg1, $arg2)
-            {
-            return $arg1.$arg2;
-            }
-        );
+        $calculator->addFunction('concat', function ($arg1, $arg2) {return $arg1.$arg2;});
         $this->assertEquals('testing', $calculator->execute('concat("test","ing")'));
         $this->assertEquals('testing', $calculator->execute("concat('test','ing')"));
     }
 
-    public function testFunctionParameterOrder()
-		{
-				$calculator = new MathExecutor();
-
-				$calculator->addFunction('concat', function ($arg1, $arg2) {return $arg1.$arg2;});
-				$this->assertEquals('testing', $calculator->execute('concat("test","ing")'));
-				$this->assertEquals('testing', $calculator->execute("concat('test','ing')"));
-		}
-
     public function testFunction()
     {
         $calculator = new MathExecutor();
-- 
cgit v1.2.3