Add S390 to architecture list

diff --git a/ChangeLog b/ChangeLog
index 2514dfd9842591a54ec042f40f878b2cbc106a90..f4e1cfc22d191e607aa04669de67c1cbb9215ba8 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -34,7 +34,6 @@
   * svr4/dummy.h, svr4/syscall.h: now we handle rfork{1,all}, ssisys and
     rexecve calls.
 
->>>>>>> 1.119
 2001-04-12  Wichert Akkerman <wakkerma@debian.org>
 
   * process.c: fix cast for powerpc code