Mercurial > octave

changeset 24885:4229c8ea3227

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 Carnë Draug <carandraug@octave.org>
date Thu, 15 Mar 2018 00:12:16 +0100
parents 9909cb54d6e5
children 120e75853dab
files NEWS
diffstat 1 files changed, 0 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/NEWS	Wed Mar 14 17:25:26 2018 -0500
+++ b/NEWS	Thu Mar 15 00:12:16 2018 +0100
@@ -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):
 ----------------------------------------------------------------------