From 92d4a8181f6980c0fc94fc8e09516cb5112bb205 Mon Sep 17 00:00:00 2001
From: Francis Russell <francis@unchartedbackwaters.co.uk>
Date: Sun, 22 Jul 2012 12:45:43 +0100
Subject: [PATCH] Fix incorrectly merged .gitignore.

---
 .gitignore | 1 -
 1 file changed, 1 deletion(-)

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
-- 
2.47.3