@@ -604,12 +604,17 @@ MAKEFLAGS=
604604PACKAGE_NAME=' RcppArmadillo'
605605PACKAGE_TARNAME=' rcpparmadillo'
606606<<< <<< < HEAD
607+ <<< <<< < HEAD
607608PACKAGE_VERSION=' 14.6.3-1'
608609PACKAGE_STRING=' RcppArmadillo 14.6.3-1'
609610=======
610611PACKAGE_VERSION=' 14.90.0-2'
611612PACKAGE_STRING=' RcppArmadillo 14.90.0-2'
612613>>>>>>> 04afddb3 (RcppArmadillo 14.90.0-2 with Armadillo 14.90.0 (15.0.rc) and 14.6.2)
614+ =======
615+ PACKAGE_VERSION=' 14.90.0-3'
616+ PACKAGE_STRING=' RcppArmadillo 14.90.0-3'
617+ >>>>>>> 669ad971 (RcppArmadillo 14.90.0-3)
613618PACKAGE_BUGREPORT=
' [email protected] ' 614619PACKAGE_URL=' '
615620
@@ -1228,10 +1233,14 @@ if test "$ac_init_help" = "long"; then
12281233 # This message is too long to be a string in the A/UX 3.1 sh.
12291234 cat << _ACEOF
12301235<<<<<<< HEAD
1236+ <<<<<<< HEAD
12311237'configure' configures RcppArmadillo 14.6.3-1 to adapt to many kinds of systems.
12321238=======
12331239'configure' configures RcppArmadillo 14.90.0-2 to adapt to many kinds of systems.
12341240>>>>>>> 04afddb3 (RcppArmadillo 14.90.0-2 with Armadillo 14.90.0 (15.0.rc) and 14.6.2)
1241+ =======
1242+ 'configure' configures RcppArmadillo 14.90.0-3 to adapt to many kinds of systems.
1243+ >>>>>>> 669ad971 (RcppArmadillo 14.90.0-3)
12351244
12361245Usage: $0 [OPTION]... [VAR=VALUE]...
12371246
@@ -1293,11 +1302,15 @@ fi
12931302
12941303if test -n " $ac_init_help " ; then
12951304 case $ac_init_help in
1305+ <<<<<<< HEAD
12961306<<<<<<< HEAD
12971307 short | recursive ) echo " Configuration of RcppArmadillo 14.6.3-1:" ;;
12981308=======
12991309 short | recursive ) echo " Configuration of RcppArmadillo 14.90.0-2:" ;;
13001310>>>>>>> 04afddb3 (RcppArmadillo 14.90.0-2 with Armadillo 14.90.0 (15.0.rc) and 14.6.2)
1311+ =======
1312+ short | recursive ) echo " Configuration of RcppArmadillo 14.90.0-3:" ;;
1313+ >>>>>>> 669ad971 (RcppArmadillo 14.90.0-3)
13011314 esac
13021315 cat << \_ACEOF
13031316
@@ -1379,10 +1392,14 @@ test -n "$ac_init_help" && exit $ac_status
13791392if $ac_init_version ; then
13801393 cat << \_ACEOF
13811394<<<<<<< HEAD
1395+ <<<<<<< HEAD
13821396RcppArmadillo configure 14.6.3-1
13831397=======
13841398RcppArmadillo configure 14.90.0-2
13851399>>>>>>> 04afddb3 (RcppArmadillo 14.90.0-2 with Armadillo 14.90.0 (15.0.rc) and 14.6.2)
1400+ =======
1401+ RcppArmadillo configure 14.90.0-3
1402+ >>>>>>> 669ad971 (RcppArmadillo 14.90.0-3)
13861403generated by GNU Autoconf 2.72
13871404
13881405Copyright (C) 2023 Free Software Foundation, Inc.
@@ -1498,11 +1515,15 @@ cat >config.log <<_ACEOF
14981515This file contains any messages produced by compilers while
14991516running configure, to aid debugging if configure makes a mistake.
15001517
1518+ <<<<<<< HEAD
15011519<<<<<<< HEAD
15021520It was created by RcppArmadillo $as_me 14.6.3-1, which was
15031521=======
15041522It was created by RcppArmadillo $as_me 14.90.0-2, which was
15051523>>>>>>> 04afddb3 (RcppArmadillo 14.90.0-2 with Armadillo 14.90.0 (15.0.rc) and 14.6.2)
1524+ =======
1525+ It was created by RcppArmadillo $as_me 14.90.0-3, which was
1526+ >>>>>>> 669ad971 (RcppArmadillo 14.90.0-3)
15061527generated by GNU Autoconf 2.72. Invocation command line was
15071528
15081529 $ $0 $ac_configure_args_raw
@@ -4002,10 +4023,14 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
40024023# values after options handling.
40034024ac_log="
40044025<<<<<<< HEAD
4026+ <<<<<<< HEAD
40054027This file was extended by RcppArmadillo $as_me 14.6.3-1, which was
40064028=======
40074029This file was extended by RcppArmadillo $as_me 14.90.0-2, which was
40084030>>>>>>> 04afddb3 (RcppArmadillo 14.90.0-2 with Armadillo 14.90.0 (15.0.rc) and 14.6.2)
4031+ =======
4032+ This file was extended by RcppArmadillo $as_me 14.90.0-3, which was
4033+ >>>>>>> 669ad971 (RcppArmadillo 14.90.0-3)
40094034generated by GNU Autoconf 2.72. Invocation command line was
40104035
40114036 CONFIG_FILES = $CONFIG_FILES
@@ -4061,10 +4086,14 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
40614086ac_cs_config='$ac_cs_config_escaped '
40624087ac_cs_version="\\
40634088<<<<<<< HEAD
4089+ <<<<<<< HEAD
40644090RcppArmadillo config.status 14.6.3-1
40654091=======
40664092RcppArmadillo config.status 14.90.0-2
40674093>>>>>>> 04afddb3 (RcppArmadillo 14.90.0-2 with Armadillo 14.90.0 (15.0.rc) and 14.6.2)
4094+ =======
4095+ RcppArmadillo config.status 14.90.0-3
4096+ >>>>>>> 669ad971 (RcppArmadillo 14.90.0-3)
40684097configured by $0 , generated by GNU Autoconf 2.72,
40694098 with options \\ "\$ ac_cs_config\\ "
40704099
0 commit comments