@@ -605,6 +605,7 @@ PACKAGE_NAME='RcppArmadillo'
605605PACKAGE_TARNAME=' rcpparmadillo'
606606<<< <<< < HEAD
607607<<< <<< < HEAD
608+ <<< <<< < HEAD
608609PACKAGE_VERSION=' 14.6.3-1'
609610PACKAGE_STRING=' RcppArmadillo 14.6.3-1'
610611=======
@@ -615,6 +616,10 @@ PACKAGE_STRING='RcppArmadillo 14.90.0-2'
615616PACKAGE_VERSION=' 14.90.0-3'
616617PACKAGE_STRING=' RcppArmadillo 14.90.0-3'
617618>>>>>>> 669ad971 (RcppArmadillo 14.90.0-3)
619+ =======
620+ PACKAGE_VERSION=' 14.90.0-4'
621+ PACKAGE_STRING=' RcppArmadillo 14.90.0-4'
622+ >>>>>>> 0fca2ffa (RcppArmadillo 14.90.0-4)
618623PACKAGE_BUGREPORT=
' [email protected] ' 619624PACKAGE_URL=' '
620625
@@ -1234,13 +1239,17 @@ if test "$ac_init_help" = "long"; then
12341239 cat << _ACEOF
12351240<<<<<<< HEAD
12361241<<<<<<< HEAD
1242+ <<<<<<< HEAD
12371243'configure' configures RcppArmadillo 14.6.3-1 to adapt to many kinds of systems.
12381244=======
12391245'configure' configures RcppArmadillo 14.90.0-2 to adapt to many kinds of systems.
12401246>>>>>>> 04afddb3 (RcppArmadillo 14.90.0-2 with Armadillo 14.90.0 (15.0.rc) and 14.6.2)
12411247=======
12421248'configure' configures RcppArmadillo 14.90.0-3 to adapt to many kinds of systems.
12431249>>>>>>> 669ad971 (RcppArmadillo 14.90.0-3)
1250+ =======
1251+ 'configure' configures RcppArmadillo 14.90.0-4 to adapt to many kinds of systems.
1252+ >>>>>>> 0fca2ffa (RcppArmadillo 14.90.0-4)
12441253
12451254Usage: $0 [OPTION]... [VAR=VALUE]...
12461255
13031312if test -n " $ac_init_help " ; then
13041313 case $ac_init_help in
13051314<<<<<<< HEAD
1315+ <<<<<<< HEAD
13061316<<<<<<< HEAD
13071317 short | recursive ) echo " Configuration of RcppArmadillo 14.6.3-1:" ;;
13081318=======
@@ -1311,6 +1321,9 @@ if test -n "$ac_init_help"; then
13111321=======
13121322 short | recursive ) echo " Configuration of RcppArmadillo 14.90.0-3:" ;;
13131323>>>>>>> 669ad971 (RcppArmadillo 14.90.0-3)
1324+ =======
1325+ short | recursive ) echo " Configuration of RcppArmadillo 14.90.0-4:" ;;
1326+ >>>>>>> 0fca2ffa (RcppArmadillo 14.90.0-4)
13141327 esac
13151328 cat << \_ACEOF
13161329
@@ -1393,13 +1406,17 @@ if $ac_init_version; then
13931406 cat << \_ACEOF
13941407<<<<<<< HEAD
13951408<<<<<<< HEAD
1409+ <<<<<<< HEAD
13961410RcppArmadillo configure 14.6.3-1
13971411=======
13981412RcppArmadillo configure 14.90.0-2
13991413>>>>>>> 04afddb3 (RcppArmadillo 14.90.0-2 with Armadillo 14.90.0 (15.0.rc) and 14.6.2)
14001414=======
14011415RcppArmadillo configure 14.90.0-3
14021416>>>>>>> 669ad971 (RcppArmadillo 14.90.0-3)
1417+ =======
1418+ RcppArmadillo configure 14.90.0-4
1419+ >>>>>>> 0fca2ffa (RcppArmadillo 14.90.0-4)
14031420generated by GNU Autoconf 2.72
14041421
14051422Copyright (C) 2023 Free Software Foundation, Inc.
@@ -1515,6 +1532,7 @@ cat >config.log <<_ACEOF
15151532This file contains any messages produced by compilers while
15161533running configure, to aid debugging if configure makes a mistake.
15171534
1535+ <<<<<<< HEAD
15181536<<<<<<< HEAD
15191537<<<<<<< HEAD
15201538It was created by RcppArmadillo $as_me 14.6.3-1, which was
@@ -1524,6 +1542,9 @@ It was created by RcppArmadillo $as_me 14.90.0-2, which was
15241542=======
15251543It was created by RcppArmadillo $as_me 14.90.0-3, which was
15261544>>>>>>> 669ad971 (RcppArmadillo 14.90.0-3)
1545+ =======
1546+ It was created by RcppArmadillo $as_me 14.90.0-4, which was
1547+ >>>>>>> 0fca2ffa (RcppArmadillo 14.90.0-4)
15271548generated by GNU Autoconf 2.72. Invocation command line was
15281549
15291550 $ $0 $ac_configure_args_raw
@@ -4024,13 +4045,17 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
40244045ac_log="
40254046<<<<<<< HEAD
40264047<<<<<<< HEAD
4048+ <<<<<<< HEAD
40274049This file was extended by RcppArmadillo $as_me 14.6.3-1, which was
40284050=======
40294051This file was extended by RcppArmadillo $as_me 14.90.0-2, which was
40304052>>>>>>> 04afddb3 (RcppArmadillo 14.90.0-2 with Armadillo 14.90.0 (15.0.rc) and 14.6.2)
40314053=======
40324054This file was extended by RcppArmadillo $as_me 14.90.0-3, which was
40334055>>>>>>> 669ad971 (RcppArmadillo 14.90.0-3)
4056+ =======
4057+ This file was extended by RcppArmadillo $as_me 14.90.0-4, which was
4058+ >>>>>>> 0fca2ffa (RcppArmadillo 14.90.0-4)
40344059generated by GNU Autoconf 2.72. Invocation command line was
40354060
40364061 CONFIG_FILES = $CONFIG_FILES
@@ -4087,13 +4112,17 @@ ac_cs_config='$ac_cs_config_escaped'
40874112ac_cs_version="\\
40884113<<<<<<< HEAD
40894114<<<<<<< HEAD
4115+ <<<<<<< HEAD
40904116RcppArmadillo config.status 14.6.3-1
40914117=======
40924118RcppArmadillo config.status 14.90.0-2
40934119>>>>>>> 04afddb3 (RcppArmadillo 14.90.0-2 with Armadillo 14.90.0 (15.0.rc) and 14.6.2)
40944120=======
40954121RcppArmadillo config.status 14.90.0-3
40964122>>>>>>> 669ad971 (RcppArmadillo 14.90.0-3)
4123+ =======
4124+ RcppArmadillo config.status 14.90.0-4
4125+ >>>>>>> 0fca2ffa (RcppArmadillo 14.90.0-4)
40974126configured by $0 , generated by GNU Autoconf 2.72,
40984127 with options \\ "\$ ac_cs_config\\ "
40994128
0 commit comments