[Debian-astro-commits] [gyoto] 66/221: fix format of NEWS file

[Thibaut Jean-Claude Paumard]

This is an automated email from the git hooks/post-receive script.

thibaut pushed a commit to branch master
in repository gyoto.

commit 705cd88d901a4de50d348da020082d3d1b577732
Author: Thibaut Paumard <paumard at users.sourceforge.net>
Date:   Tue Oct 21 15:24:41 2014 +0200

    fix format of NEWS file
---
 NEWS | 1 -
 1 file changed, 1 deletion(-)

diff --git a/NEWS b/NEWS
index 5ab3dd5..ec7680a 100644
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 next future ABI 3
    * New functionality: MPI-based parallelisation
    * Change Scenery::rayTrace() API, replacing i/jmin and max with a

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-astro/packages/gyoto.git