The Higher Education and Research forge

Home My Page Projects Code Snippets Project Openings MMD
Summary Activity Forums Tracker Lists Tasks Docs Surveys News SCM Files

SCM Repository

authorAlain <alain.bastide@univ-reunion.fr>
Sat, 4 Jul 2020 03:12:38 +0000 (07:12 +0400)
committerAlain <alain.bastide@univ-reunion.fr>
Sat, 4 Jul 2020 03:12:38 +0000 (07:12 +0400)
README.md

index eddbabf..cff3fe0 100644 (file)
--- a/README.md
+++ b/README.md
@@ -1,8 +1,6 @@
 # MMD
 
 ## Versions
-<<<<<<< HEAD
-
 0.0.3 Few Dual Mesh elements added
 
 0.0.2 Improve methods, profiling the code and improve speed
 
 ## To Do
 
-[Link to TODO File](TODO.md)
-=======
->>>>>>> master
-
-
-
-<<<<<<< HEAD
-=======
-v0.0.1 Geometry for primal mesh on hexahedral elements
-
-
-
-## TO DO
-
-[Link to TODO File](TODO.md)
-
-
-
->>>>>>> master
+[Link to TODO File](TODO.md)
\ No newline at end of file