]> git.unchartedbackwaters.co.uk Git - francis/excafe_benchmarks.git/commitdiff
projects / francis / excafe_benchmarks.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 49ff95c)
Fix incorrectly merged .gitignore.
authorFrancis Russell <francis@unchartedbackwaters.co.uk>
Sun, 22 Jul 2012 11:45:43 +0000 (12:45 +0100)
committerFrancis Russell <francis@unchartedbackwaters.co.uk>
Sun, 22 Jul 2012 11:45:43 +0000 (12:45 +0100)
.gitignore patch | blob | history

diff --git a/.gitignore b/.gitignore
index 0a393500ce74dd1623ff2abe95a7fd614d31a2db..2ff18ce86988b36caafa145e2eccfce520367cae 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -18,4 +18,3 @@
 /laplacian_2d/laplacian_f?_p?_q?.ufl
 /laplacian_2d/laplacian_f?_p?_q?_tensor.ufl
 /laplacian_2d/laplacian_f?_p?_q?_quadrature.ufl
->>>>>>> master
Benchmarking scripts/code for Excafé.