From: Alma Dejus <almde515@student.liu.se>
Date: Wed, 11 Oct 2023 12:15:59 +0000 (+0200)
Subject: merged and fixed conflict
X-Git-Url: https://gitweb.forssennils.se/?a=commitdiff_plain;h=f0ffcd6b7e0295c7e74d134c258f1632aa1526af;p=TDDC76.git

merged and fixed conflict
---

f0ffcd6b7e0295c7e74d134c258f1632aa1526af
diff --cc src/test.cc
index b037c80,fef23fd..ce8e8ba
--- a/src/test.cc
+++ b/src/test.cc
@@@ -90,7 -90,7 +90,11 @@@ TEST_CASE("Noder"
  }
  TEST_CASE("Expression")
  {
++<<<<<<< HEAD
 +    // Added another comment
++=======
+     //Added a comment
++>>>>>>> b58fae269fcfa155b9a9dd2c2df54e4f264fb325
      Expression e{"(1+2)^3"};
  }
  TEST_CASE("Memory management")