mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-08-26 23:13:00 +02:00
Code Issues Packages Projects Releases Wiki Activity

configure.ac: fix merge error

Browse Source 
Origin commit data
------------------
Branch: ni/coolstream
Commit: 2458f9b89d
Author: vanhofen <vanhofen@gmx.de>
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
This commit is contained in:
vanhofen
2017-06-07 15:28:53 +02:00
parent 48db0bd94c
commit e341deaadf
1 changed files with 0 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
configure.ac
View File

@@ -1,8 +1,4 @@
<<<<<<< HEAD
AC_INIT(NI-Neutrino,3.40.0) AC_INIT(NI-Neutrino,3.40.0)
=======
AC_INIT(Tuxbox-Neutrino,3.5.0)
>>>>>>> 45f915dd390a68dc0fc702185e6d94bf5d156611
AM_INIT_AUTOMAKE([1.0.1 nostdinc]) AM_INIT_AUTOMAKE([1.0.1 nostdinc])
m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES]) m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES])