From 809be49e35fe1fd2a2eba1d2738f180eabea31c3 Mon Sep 17 00:00:00 2001
From: Jean-Matthieu Etancelin <jean-matthieu.etancelin@imag.fr>
Date: Fri, 24 Jan 2014 09:39:24 +0000
Subject: [PATCH] Remove conflict on Table3

-- 
GitLab