@@ -606,6 +606,7 @@ PACKAGE_TARNAME='rcpparmadillo'
606606<<< <<< < HEAD
607607<<< <<< < HEAD
608608<<< <<< < HEAD
609+ <<< <<< < HEAD
609610PACKAGE_VERSION=' 14.6.3-1'
610611PACKAGE_STRING=' RcppArmadillo 14.6.3-1'
611612=======
@@ -620,6 +621,10 @@ PACKAGE_STRING='RcppArmadillo 14.90.0-3'
620621PACKAGE_VERSION=' 14.90.0-4'
621622PACKAGE_STRING=' RcppArmadillo 14.90.0-4'
622623>>>>>>> 0fca2ffa (RcppArmadillo 14.90.0-4)
624+ =======
625+ PACKAGE_VERSION=' 14.90.0-5'
626+ PACKAGE_STRING=' RcppArmadillo 14.90.0-5'
627+ >>>>>>> 04a1d803 (RcppArmadillo 14.90.0-5)
623628PACKAGE_BUGREPORT=
' [email protected] ' 624629PACKAGE_URL=' '
625630
@@ -1240,6 +1245,7 @@ if test "$ac_init_help" = "long"; then
12401245<<<<<<< HEAD
12411246<<<<<<< HEAD
12421247<<<<<<< HEAD
1248+ <<<<<<< HEAD
12431249'configure' configures RcppArmadillo 14.6.3-1 to adapt to many kinds of systems.
12441250=======
12451251'configure' configures RcppArmadillo 14.90.0-2 to adapt to many kinds of systems.
@@ -1250,6 +1256,9 @@ if test "$ac_init_help" = "long"; then
12501256=======
12511257'configure' configures RcppArmadillo 14.90.0-4 to adapt to many kinds of systems.
12521258>>>>>>> 0fca2ffa (RcppArmadillo 14.90.0-4)
1259+ =======
1260+ 'configure' configures RcppArmadillo 14.90.0-5 to adapt to many kinds of systems.
1261+ >>>>>>> 04a1d803 (RcppArmadillo 14.90.0-5)
12531262
12541263Usage: $0 [OPTION]... [VAR=VALUE]...
12551264
@@ -1313,6 +1322,7 @@ if test -n "$ac_init_help"; then
13131322 case $ac_init_help in
13141323<<<<<<< HEAD
13151324<<<<<<< HEAD
1325+ <<<<<<< HEAD
13161326<<<<<<< HEAD
13171327 short | recursive ) echo " Configuration of RcppArmadillo 14.6.3-1:" ;;
13181328=======
@@ -1324,6 +1334,9 @@ if test -n "$ac_init_help"; then
13241334=======
13251335 short | recursive ) echo " Configuration of RcppArmadillo 14.90.0-4:" ;;
13261336>>>>>>> 0fca2ffa (RcppArmadillo 14.90.0-4)
1337+ =======
1338+ short | recursive ) echo " Configuration of RcppArmadillo 14.90.0-5:" ;;
1339+ >>>>>>> 04a1d803 (RcppArmadillo 14.90.0-5)
13271340 esac
13281341 cat << \_ACEOF
13291342
@@ -1407,6 +1420,7 @@ if $ac_init_version; then
14071420<<<<<<< HEAD
14081421<<<<<<< HEAD
14091422<<<<<<< HEAD
1423+ <<<<<<< HEAD
14101424RcppArmadillo configure 14.6.3-1
14111425=======
14121426RcppArmadillo configure 14.90.0-2
@@ -1417,6 +1431,9 @@ RcppArmadillo configure 14.90.0-3
14171431=======
14181432RcppArmadillo configure 14.90.0-4
14191433>>>>>>> 0fca2ffa (RcppArmadillo 14.90.0-4)
1434+ =======
1435+ RcppArmadillo configure 14.90.0-5
1436+ >>>>>>> 04a1d803 (RcppArmadillo 14.90.0-5)
14201437generated by GNU Autoconf 2.72
14211438
14221439Copyright (C) 2023 Free Software Foundation, Inc.
@@ -1535,6 +1552,7 @@ running configure, to aid debugging if configure makes a mistake.
15351552<<<<<<< HEAD
15361553<<<<<<< HEAD
15371554<<<<<<< HEAD
1555+ <<<<<<< HEAD
15381556It was created by RcppArmadillo $as_me 14.6.3-1, which was
15391557=======
15401558It was created by RcppArmadillo $as_me 14.90.0-2, which was
@@ -1545,6 +1563,9 @@ It was created by RcppArmadillo $as_me 14.90.0-3, which was
15451563=======
15461564It was created by RcppArmadillo $as_me 14.90.0-4, which was
15471565>>>>>>> 0fca2ffa (RcppArmadillo 14.90.0-4)
1566+ =======
1567+ It was created by RcppArmadillo $as_me 14.90.0-5, which was
1568+ >>>>>>> 04a1d803 (RcppArmadillo 14.90.0-5)
15481569generated by GNU Autoconf 2.72. Invocation command line was
15491570
15501571 $ $0 $ac_configure_args_raw
@@ -4046,6 +4067,7 @@ ac_log="
40464067<<<<<<< HEAD
40474068<<<<<<< HEAD
40484069<<<<<<< HEAD
4070+ <<<<<<< HEAD
40494071This file was extended by RcppArmadillo $as_me 14.6.3-1, which was
40504072=======
40514073This file was extended by RcppArmadillo $as_me 14.90.0-2, which was
@@ -4056,6 +4078,9 @@ This file was extended by RcppArmadillo $as_me 14.90.0-3, which was
40564078=======
40574079This file was extended by RcppArmadillo $as_me 14.90.0-4, which was
40584080>>>>>>> 0fca2ffa (RcppArmadillo 14.90.0-4)
4081+ =======
4082+ This file was extended by RcppArmadillo $as_me 14.90.0-5, which was
4083+ >>>>>>> 04a1d803 (RcppArmadillo 14.90.0-5)
40594084generated by GNU Autoconf 2.72. Invocation command line was
40604085
40614086 CONFIG_FILES = $CONFIG_FILES
@@ -4113,6 +4138,7 @@ ac_cs_version="\\
41134138<<<<<<< HEAD
41144139<<<<<<< HEAD
41154140<<<<<<< HEAD
4141+ <<<<<<< HEAD
41164142RcppArmadillo config.status 14.6.3-1
41174143=======
41184144RcppArmadillo config.status 14.90.0-2
@@ -4123,6 +4149,9 @@ RcppArmadillo config.status 14.90.0-3
41234149=======
41244150RcppArmadillo config.status 14.90.0-4
41254151>>>>>>> 0fca2ffa (RcppArmadillo 14.90.0-4)
4152+ =======
4153+ RcppArmadillo config.status 14.90.0-5
4154+ >>>>>>> 04a1d803 (RcppArmadillo 14.90.0-5)
41264155configured by $0 , generated by GNU Autoconf 2.72,
41274156 with options \\ "\$ ac_cs_config\\ "
41284157
0 commit comments