From e341deaadf7fe7f64b7f63a2f72be1331d4d6ef8 Mon Sep 17 00:00:00 2001 From: vanhofen Date: Wed, 7 Jun 2017 15:28:53 +0200 Subject: [PATCH] configure.ac: fix merge error Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/2458f9b89da63d176dc0dd40346f93a9020504bf Author: vanhofen Date: 2017-06-07 (Wed, 07 Jun 2017) Origin message was: ------------------ - configure.ac: fix merge error ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- configure.ac | 4 ---- 1 file changed, 4 deletions(-) diff --git a/configure.ac b/configure.ac index 327e27866..cead7db89 100644 --- a/configure.ac +++ b/configure.ac @@ -1,8 +1,4 @@ -<<<<<<< HEAD AC_INIT(NI-Neutrino,3.40.0) -======= -AC_INIT(Tuxbox-Neutrino,3.5.0) ->>>>>>> 45f915dd390a68dc0fc702185e6d94bf5d156611 AM_INIT_AUTOMAKE([1.0.1 nostdinc]) m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES])