resolve merge conflicts
Showing
- .gitignore 1 addition, 1 deletion.gitignore
- envs/msvc.cmd 60 additions, 0 deletionsenvs/msvc.cmd
- lib/get_eigen.sh 0 additions, 0 deletionslib/get_eigen.sh
- lib/get_gmsh.sh 0 additions, 0 deletionslib/get_gmsh.sh
- srcs/FEM/my_code.cpp 179 additions, 165 deletionssrcs/FEM/my_code.cpp
- srcs/FEM/my_geo.geo 2 additions, 2 deletionssrcs/FEM/my_geo.geo
envs/msvc.cmd
0 → 100644
lib/get_eigen.sh
100644 → 100755
File mode changed from 100644 to 100755
lib/get_gmsh.sh
100644 → 100755
File mode changed from 100644 to 100755
This diff is collapsed.
Please register or sign in to comment