@@ -604,12 +604,17 @@ MAKEFLAGS=
604
604
PACKAGE_NAME=' RcppArmadillo'
605
605
PACKAGE_TARNAME=' rcpparmadillo'
606
606
<<< <<< < HEAD
607
+ <<< <<< < HEAD
607
608
PACKAGE_VERSION=' 14.6.3-1'
608
609
PACKAGE_STRING=' RcppArmadillo 14.6.3-1'
609
610
=======
610
611
PACKAGE_VERSION=' 14.90.0-2'
611
612
PACKAGE_STRING=' RcppArmadillo 14.90.0-2'
612
613
>>>>>>> 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)
613
618
PACKAGE_BUGREPORT=
' [email protected] '
614
619
PACKAGE_URL=' '
615
620
@@ -1228,10 +1233,14 @@ if test "$ac_init_help" = "long"; then
1228
1233
# This message is too long to be a string in the A/UX 3.1 sh.
1229
1234
cat << _ACEOF
1230
1235
<<<<<<< HEAD
1236
+ <<<<<<< HEAD
1231
1237
'configure' configures RcppArmadillo 14.6.3-1 to adapt to many kinds of systems.
1232
1238
=======
1233
1239
'configure' configures RcppArmadillo 14.90.0-2 to adapt to many kinds of systems.
1234
1240
>>>>>>> 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)
1235
1244
1236
1245
Usage: $0 [OPTION]... [VAR=VALUE]...
1237
1246
@@ -1293,11 +1302,15 @@ fi
1293
1302
1294
1303
if test -n " $ac_init_help " ; then
1295
1304
case $ac_init_help in
1305
+ <<<<<<< HEAD
1296
1306
<<<<<<< HEAD
1297
1307
short | recursive ) echo " Configuration of RcppArmadillo 14.6.3-1:" ;;
1298
1308
=======
1299
1309
short | recursive ) echo " Configuration of RcppArmadillo 14.90.0-2:" ;;
1300
1310
>>>>>>> 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)
1301
1314
esac
1302
1315
cat << \_ACEOF
1303
1316
@@ -1379,10 +1392,14 @@ test -n "$ac_init_help" && exit $ac_status
1379
1392
if $ac_init_version ; then
1380
1393
cat << \_ACEOF
1381
1394
<<<<<<< HEAD
1395
+ <<<<<<< HEAD
1382
1396
RcppArmadillo configure 14.6.3-1
1383
1397
=======
1384
1398
RcppArmadillo configure 14.90.0-2
1385
1399
>>>>>>> 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)
1386
1403
generated by GNU Autoconf 2.72
1387
1404
1388
1405
Copyright (C) 2023 Free Software Foundation, Inc.
@@ -1498,11 +1515,15 @@ cat >config.log <<_ACEOF
1498
1515
This file contains any messages produced by compilers while
1499
1516
running configure, to aid debugging if configure makes a mistake.
1500
1517
1518
+ <<<<<<< HEAD
1501
1519
<<<<<<< HEAD
1502
1520
It was created by RcppArmadillo $as_me 14.6.3-1, which was
1503
1521
=======
1504
1522
It was created by RcppArmadillo $as_me 14.90.0-2, which was
1505
1523
>>>>>>> 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)
1506
1527
generated by GNU Autoconf 2.72. Invocation command line was
1507
1528
1508
1529
$ $0 $ac_configure_args_raw
@@ -4002,10 +4023,14 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
4002
4023
# values after options handling.
4003
4024
ac_log="
4004
4025
<<<<<<< HEAD
4026
+ <<<<<<< HEAD
4005
4027
This file was extended by RcppArmadillo $as_me 14.6.3-1, which was
4006
4028
=======
4007
4029
This file was extended by RcppArmadillo $as_me 14.90.0-2, which was
4008
4030
>>>>>>> 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)
4009
4034
generated by GNU Autoconf 2.72. Invocation command line was
4010
4035
4011
4036
CONFIG_FILES = $CONFIG_FILES
@@ -4061,10 +4086,14 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
4061
4086
ac_cs_config='$ac_cs_config_escaped '
4062
4087
ac_cs_version="\\
4063
4088
<<<<<<< HEAD
4089
+ <<<<<<< HEAD
4064
4090
RcppArmadillo config.status 14.6.3-1
4065
4091
=======
4066
4092
RcppArmadillo config.status 14.90.0-2
4067
4093
>>>>>>> 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)
4068
4097
configured by $0 , generated by GNU Autoconf 2.72,
4069
4098
with options \\ "\$ ac_cs_config\\ "
4070
4099
0 commit comments