zhyang-dev/CFDEMcoupling-PFM
1
0
Fork 0
mirror of https://github.com/ParticulateFlow/CFDEMcoupling-PFM.git synced 2025-12-08 06:37:44 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixed merge conflict.

Browse Source
This commit is contained in:
Thomas Lichtenegger
2017-09-08 12:25:32 +02:00
parent 8c2726bc99
commit f31cb89065
1 changed files with 0 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
.gitignore vendored
View File

@ -5,10 +5,4 @@
log_*
log.*
*~
<<<<<<< HEAD
linux64Gcc*
lnInclude
=======
**/linux64GccDPInt32Opt
>>>>>>> b8921ec6ca10719a4aa4990fcbaf730076fb67fd