[Eliot-dev] Changes to eliot/dic/hashtable.c [antoine-1]

[eliot-dev]

Index: eliot/dic/hashtable.c
diff -u eliot/dic/hashtable.c:1.3.2.1 eliot/dic/hashtable.c:1.3.2.2
--- eliot/dic/hashtable.c:1.3.2.1       Sun Oct 23 17:13:56 2005
+++ eliot/dic/hashtable.c       Sun Oct 23 18:38:18 2005
@@ -17,18 +17,13 @@
 /* along with this program; if not, write to the Free Software               */
 /* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA 
*/
 
-<<<<<<< hashtable.c
-/* $Id: hashtable.c,v 1.3.2.1 2005/10/23 17:13:56 afrab Exp $ */
+/* $Id: hashtable.c,v 1.3.2.2 2005/10/23 18:38:18 afrab Exp $ */
 
 /**
  *  \file   hashtable.c
  *  \brief  Simple hashtable type
  *  \author Antoine Fraboulet
  *  \date   1999
-=======
-/*
- * $Id: hashtable.c,v 1.3.2.1 2005/10/23 17:13:56 afrab Exp $
->>>>>>> 1.3
  */
 
 #include <stdio.h>