fixed merged conflicts

bbercovici · Feb 21, 2019 · fb7dca8 · fb7dca8
2 parents ef1342a + 6028ab2
commit fb7dca8
Show file tree

Hide file tree

Showing 45 changed files with 1 addition and 111,047 deletions.
diff --git a/.gitignore b/.gitignore
@@ -3,4 +3,4 @@ Doxyfile
 doxygen_script.sh
 doc/
 .add_license.sh
-Tests/output/*
+.LICENSE.hpp
diff --git a/Deprecated/Examples/.DS_Store b/Deprecated/Examples/.DS_Store
diff --git a/Deprecated/Examples/FramesAccelerations/CMakeLists.txt b/Deprecated/Examples/FramesAccelerations/CMakeLists.txt
diff --git a/Deprecated/Examples/FramesAccelerations/cube.obj b/Deprecated/Examples/FramesAccelerations/cube.obj
diff --git a/Deprecated/Examples/FramesAccelerations/source/main.cpp b/Deprecated/Examples/FramesAccelerations/source/main.cpp
diff --git a/Deprecated/Examples/GravitationalSlopes/.DS_Store b/Deprecated/Examples/GravitationalSlopes/.DS_Store
diff --git a/Deprecated/Examples/GravitationalSlopes/CMakeLists.txt b/Deprecated/Examples/GravitationalSlopes/CMakeLists.txt