Skip to content
Snippets Groups Projects
Commit 77e9f168 authored by Luigi Scarso's avatar Luigi Scarso
Browse files

fixed .gitignore

parent 5496c120
Branches
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 0 additions and 3 deletions
.gitignore
+ 0
− 3
View file @ 77e9f168
......@@ -15,7 +15,4 @@
.*.swp
.DS_store
# Simulated Subversion default ignores end here
<<<<<<< HEAD
/build-ppc
=======
>>>>>>> 5974746c (Branch mpfi: support for interval arithmetic. Initial commit (work in progress))
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment