Update project.yml

11 months ago · e2a4524bf9
1 changed files with 0 additions and 13 deletions
--- a/project.yml
+++ b/project.yml
@ -91,17 +91,6 @@
  :system:
    - m  # Example: add 'm' to use the math library
  :test:
-<<<<<<< HEAD
-    - stdio
-    - string
-    - stdlib
-    - m  # Example: add 'm' to use the math library in tests
-  :release:
-    - stdio
-    - string
-    - stdlib
-    - m  # Example: add 'm' to use the math library in release builds
-=======
    #- stdio
    #- string
    #- stdlib
@ -111,8 +100,6 @@
    #- string
    #- stdlib
    #- m  # Example: add 'm' to use the math library in release builds
->>>>>>> develop
-
 :plugins:
  :load_paths:
    - "#{Ceedling.load_path}"