[Eliot-dev] Changes to eliot/dic/automaton.h [antoine-1]

[eliot-dev]

Index: eliot/dic/automaton.h
diff -u eliot/dic/automaton.h:1.8.2.1 eliot/dic/automaton.h:1.8.2.2
--- eliot/dic/automaton.h:1.8.2.1       Sun Oct 23 17:13:56 2005
+++ eliot/dic/automaton.h       Sun Oct 23 18:38:18 2005
@@ -17,13 +17,7 @@
 /* along with this program; if not, write to the Free Software               */
 /* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA 
*/
 
-<<<<<<< automaton.h
-/* $Id: automaton.h,v 1.8.2.1 2005/10/23 17:13:56 afrab Exp $ */
-=======
-/*
- * $Id: automaton.h,v 1.8.2.1 2005/10/23 17:13:56 afrab Exp $
- */
->>>>>>> 1.8
+/* $Id: automaton.h,v 1.8.2.2 2005/10/23 18:38:18 afrab Exp $ */
 
 /**
  *  \file   automaton.h