RNAblueprint 1.2.3

configure.ac

@@ -1,11 +1,7 @@
 # RNAblueprint: configure.ac
 
 # initial information about the project
-<<<<<<< HEAD
-AC_INIT([RNAblueprint],[1.2.1],[[email protected]],[RNAblueprint],[http://www.tbi.univie.ac.at/~jango/])
-=======
-AC_INIT([RNAblueprint],[1.2.2],[[email protected]],[RNAblueprint],[https://github.com/ViennaRNA/RNAblueprint])
->>>>>>> develop
+AC_INIT([RNAblueprint],[1.2.3],[[email protected]],[RNAblueprint],[https://github.com/ViennaRNA/RNAblueprint])
 
 # automake initialisation (mandatory)
 AC_PREREQ([2.59])

src/Makefile.am

@@ -6,11 +6,7 @@ bin_PROGRAMS = RNAblueprint
 
 # additional include pathes necessary to compile the C++ programs
 RNAblueprint_CPPFLAGS = -I$(top_srcdir)/lib $(BOOST_CPPFLAGS) @AM_CXXFLAGS@
-<<<<<<< HEAD
-RNAblueprint_LDFLAGS =$(LDFLAGS) $(BOOST_GRAPH_LDFLAGS) $(BOOST_PROGRAM_OPTIONS_LDFLAGS)
-=======
 RNAblueprint_LDFLAGS = $(LDFLAGS) $(BOOST_GRAPH_LDFLAGS) $(BOOST_PROGRAM_OPTIONS_LDFLAGS)
->>>>>>> develop
 RNAblueprint_LDADD = $(LDADD) $(top_builddir)/lib/libRNAblueprint.la $(BOOST_GRAPH_LIBS) $(BOOST_PROGRAM_OPTIONS_LIBS) $(AM_LDFLAGS)
 
 # list of sources for the 'RNAblueprint' binary