Index: ChangeLog
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/ChangeLog,v
retrieving revision 1.8642
diff -u -r1.8642 ChangeLog
--- ChangeLog	22 Nov 2005 03:31:30 -0000	1.8642
+++ ChangeLog	22 Nov 2005 09:38:58 -0000
@@ -1,3 +1,11 @@
+<<<<<<< ChangeLog
+2005-11-22  Matt Hodges  <address@hidden>
+
+	* textmodes/table.el: Change beginning-of-line to
+	move-beginning-of-line and end-of-line to move-end-of-line in
+	Point Motion group.
+
+=======
 2005-11-21  Luc Teirlinck  <address@hidden>
 
 	* startup.el (command-line): Make sure that loaddefs.el is handled
@@ -15,6 +23,7 @@
 	* progmodes/sh-script.el (sh-font-lock-paren): Handle continued lines
 	in patterns.
 
+>>>>>>> 1.8642
 2005-11-21  Juri Linkov  <address@hidden>
 
 	* custom.el (defcustom): Update link types in docstring.