From: Francis Russell <francis@unchartedbackwaters.co.uk>
Date: Sun, 22 Jul 2012 11:45:43 +0000 (+0100)
Subject: Fix incorrectly merged .gitignore.
X-Git-Url: https://git.unchartedbackwaters.co.uk/w/?a=commitdiff_plain;h=92d4a8181f6980c0fc94fc8e09516cb5112bb205;p=francis%2Fexcafe_benchmarks.git

Fix incorrectly merged .gitignore.
---

diff --git a/.gitignore b/.gitignore
index 0a39350..2ff18ce 100644
--- 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