Mercurial > octave

changeset 24887:9c96c084e744 stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
maint: remove merge clutter from NEWS file (bug #53345)
author Mike Miller <mtmiller@octave.org>
date Wed, 14 Mar 2018 16:48:45 -0700
parents 553c51dcd70e
children bdecc7465840
files NEWS
diffstat 1 files changed, 0 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/NEWS	Thu Mar 15 00:45:39 2018 +0100
+++ b/NEWS	Wed Mar 14 16:48:45 2018 -0700
@@ -733,10 +733,7 @@
 
  ** add missing classdef test files (bug #49819)
 
-<<<<<<< working copy
-=======
 
->>>>>>> merge rev
 Summary of important user-visible changes for version 4.2 (2016-11-13):
 ----------------------------------------------------------------------