# HG changeset patch
# User Rik <octave@nomad.inbox5.com>
# Date 1302711758 25200
# Node ID 114ccc6da959dfab19a6531b1ee5d8d29622587e
# Parent  dc5920733a962facd230726213716c89e04530e9
scripts/ChangeLog: Remove results of bad merge in ChangeLog.

diff -r dc5920733a96 -r 114ccc6da959 scripts/ChangeLog
--- a/scripts/ChangeLog	Tue Apr 12 23:22:26 2011 -0500
+++ b/scripts/ChangeLog	Wed Apr 13 09:22:38 2011 -0700
@@ -1,3 +1,7 @@
+2011-04-13  Rik  <octave@nomad.inbox5.com>
+
+	* ChangeLog: Remove results of bad merge in ChangeLog.
+
 2011-04-12  Ben Abbott  <bpabbott@mac.com>
 
 	* miscellaneous/getappdata.m: If no property name is provided, return
@@ -15,24 +19,21 @@
 
 2011-04-08  Rik  <octave@nomad.inbox5.com>
 
-<<<<<<< local
-	* scripts/deprecated/module.mk, statistics/base/center.m,
+	* deprecated/module.mk, statistics/base/center.m,
 	statistics/base/module.mk: Deprecate studentize(), replace with
 	zscore().
-=======
+
+2011-04-08  Rik  <octave@nomad.inbox5.com>
+
 	* linear-algebra/cond.m, linear-algebra/expm.m, linear-algebra/logm.m,
 	linear-algebra/null.m, linear-algebra/orth.m, linear-algebra/rank.m,
 	linear-algebra/rref.m: Improve docstrings.
->>>>>>> other
-
-<<<<<<< local
+
 2011-04-08  Rik  <octave@nomad.inbox5.com>
 
 	* statistics/base/mode.m, statistics/base/quantile.m: Return output
 	of same class as input.
 
-=======
->>>>>>> other
 2011-04-06  Rik  <octave@nomad.inbox5.com>
 
 	* miscellaneous/pack.m: Improve docstring.