@@ -605,6 +605,7 @@ PACKAGE_NAME='RcppArmadillo'
605
605
PACKAGE_TARNAME=' rcpparmadillo'
606
606
<<< <<< < HEAD
607
607
<<< <<< < HEAD
608
+ <<< <<< < HEAD
608
609
PACKAGE_VERSION=' 14.6.3-1'
609
610
PACKAGE_STRING=' RcppArmadillo 14.6.3-1'
610
611
=======
@@ -615,6 +616,10 @@ PACKAGE_STRING='RcppArmadillo 14.90.0-2'
615
616
PACKAGE_VERSION=' 14.90.0-3'
616
617
PACKAGE_STRING=' RcppArmadillo 14.90.0-3'
617
618
>>>>>>> 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)
618
623
PACKAGE_BUGREPORT=
' [email protected] '
619
624
PACKAGE_URL=' '
620
625
@@ -1234,13 +1239,17 @@ if test "$ac_init_help" = "long"; then
1234
1239
cat << _ACEOF
1235
1240
<<<<<<< HEAD
1236
1241
<<<<<<< HEAD
1242
+ <<<<<<< HEAD
1237
1243
'configure' configures RcppArmadillo 14.6.3-1 to adapt to many kinds of systems.
1238
1244
=======
1239
1245
'configure' configures RcppArmadillo 14.90.0-2 to adapt to many kinds of systems.
1240
1246
>>>>>>> 04afddb3 (RcppArmadillo 14.90.0-2 with Armadillo 14.90.0 (15.0.rc) and 14.6.2)
1241
1247
=======
1242
1248
'configure' configures RcppArmadillo 14.90.0-3 to adapt to many kinds of systems.
1243
1249
>>>>>>> 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)
1244
1253
1245
1254
Usage: $0 [OPTION]... [VAR=VALUE]...
1246
1255
1303
1312
if test -n " $ac_init_help " ; then
1304
1313
case $ac_init_help in
1305
1314
<<<<<<< HEAD
1315
+ <<<<<<< HEAD
1306
1316
<<<<<<< HEAD
1307
1317
short | recursive ) echo " Configuration of RcppArmadillo 14.6.3-1:" ;;
1308
1318
=======
@@ -1311,6 +1321,9 @@ if test -n "$ac_init_help"; then
1311
1321
=======
1312
1322
short | recursive ) echo " Configuration of RcppArmadillo 14.90.0-3:" ;;
1313
1323
>>>>>>> 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)
1314
1327
esac
1315
1328
cat << \_ACEOF
1316
1329
@@ -1393,13 +1406,17 @@ if $ac_init_version; then
1393
1406
cat << \_ACEOF
1394
1407
<<<<<<< HEAD
1395
1408
<<<<<<< HEAD
1409
+ <<<<<<< HEAD
1396
1410
RcppArmadillo configure 14.6.3-1
1397
1411
=======
1398
1412
RcppArmadillo configure 14.90.0-2
1399
1413
>>>>>>> 04afddb3 (RcppArmadillo 14.90.0-2 with Armadillo 14.90.0 (15.0.rc) and 14.6.2)
1400
1414
=======
1401
1415
RcppArmadillo configure 14.90.0-3
1402
1416
>>>>>>> 669ad971 (RcppArmadillo 14.90.0-3)
1417
+ =======
1418
+ RcppArmadillo configure 14.90.0-4
1419
+ >>>>>>> 0fca2ffa (RcppArmadillo 14.90.0-4)
1403
1420
generated by GNU Autoconf 2.72
1404
1421
1405
1422
Copyright (C) 2023 Free Software Foundation, Inc.
@@ -1515,6 +1532,7 @@ cat >config.log <<_ACEOF
1515
1532
This file contains any messages produced by compilers while
1516
1533
running configure, to aid debugging if configure makes a mistake.
1517
1534
1535
+ <<<<<<< HEAD
1518
1536
<<<<<<< HEAD
1519
1537
<<<<<<< HEAD
1520
1538
It 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
1524
1542
=======
1525
1543
It was created by RcppArmadillo $as_me 14.90.0-3, which was
1526
1544
>>>>>>> 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)
1527
1548
generated by GNU Autoconf 2.72. Invocation command line was
1528
1549
1529
1550
$ $0 $ac_configure_args_raw
@@ -4024,13 +4045,17 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
4024
4045
ac_log="
4025
4046
<<<<<<< HEAD
4026
4047
<<<<<<< HEAD
4048
+ <<<<<<< HEAD
4027
4049
This file was extended by RcppArmadillo $as_me 14.6.3-1, which was
4028
4050
=======
4029
4051
This file was extended by RcppArmadillo $as_me 14.90.0-2, which was
4030
4052
>>>>>>> 04afddb3 (RcppArmadillo 14.90.0-2 with Armadillo 14.90.0 (15.0.rc) and 14.6.2)
4031
4053
=======
4032
4054
This file was extended by RcppArmadillo $as_me 14.90.0-3, which was
4033
4055
>>>>>>> 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)
4034
4059
generated by GNU Autoconf 2.72. Invocation command line was
4035
4060
4036
4061
CONFIG_FILES = $CONFIG_FILES
@@ -4087,13 +4112,17 @@ ac_cs_config='$ac_cs_config_escaped'
4087
4112
ac_cs_version="\\
4088
4113
<<<<<<< HEAD
4089
4114
<<<<<<< HEAD
4115
+ <<<<<<< HEAD
4090
4116
RcppArmadillo config.status 14.6.3-1
4091
4117
=======
4092
4118
RcppArmadillo config.status 14.90.0-2
4093
4119
>>>>>>> 04afddb3 (RcppArmadillo 14.90.0-2 with Armadillo 14.90.0 (15.0.rc) and 14.6.2)
4094
4120
=======
4095
4121
RcppArmadillo config.status 14.90.0-3
4096
4122
>>>>>>> 669ad971 (RcppArmadillo 14.90.0-3)
4123
+ =======
4124
+ RcppArmadillo config.status 14.90.0-4
4125
+ >>>>>>> 0fca2ffa (RcppArmadillo 14.90.0-4)
4097
4126
configured by $0 , generated by GNU Autoconf 2.72,
4098
4127
with options \\ "\$ ac_cs_config\\ "
4099
4128
0 commit comments