From da5ba7e18164f91994bf95780093625440f22a0e Mon Sep 17 00:00:00 2001
From: Gaspard Jankowiak <jankowiak@ceremade.dauphine.fr>
Date: Mon, 29 Sep 2014 10:18:35 +0200
Subject: [PATCH] Fix merge for interpolation.cpp

Should fix #6
---
 fenicstools/fem/interpolation.cpp | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

diff --git a/fenicstools/fem/interpolation.cpp b/fenicstools/fem/interpolation.cpp
index 01c500a..9ba4181 100644
--- a/fenicstools/fem/interpolation.cpp
+++ b/fenicstools/fem/interpolation.cpp
@@ -38,15 +38,10 @@ namespace dolfin
   };
   
   void extract_dof_component_map(std::unordered_map<std::size_t, 
-<<<<<<< HEAD
-                                                   std::size_t>& dof_component_map, 
-                                                   const FunctionSpace& V, 
-                                                   int* component)
-=======
-                                                      std::size_t>& dof_component_map, 
-                                                      const FunctionSpace& V, 
-                                                      int* component)
->>>>>>> 6b323df20bc1c25f8d59682393cf90dc7e50186c
+                                                    std::size_t>& dof_component_map, 
+                                 const FunctionSpace& V, 
+                                 int* component)
+
   { // Extract sub dofmaps recursively and store dof to component map
     std::unordered_map<std::size_t, std::size_t> collapsed_map;
     std::unordered_map<std::size_t, std::size_t>::iterator map_it;