@@ -606,6 +606,7 @@ PACKAGE_TARNAME='rcpparmadillo'
606
606
<<< <<< < HEAD
607
607
<<< <<< < HEAD
608
608
<<< <<< < HEAD
609
+ <<< <<< < HEAD
609
610
PACKAGE_VERSION=' 14.6.3-1'
610
611
PACKAGE_STRING=' RcppArmadillo 14.6.3-1'
611
612
=======
@@ -620,6 +621,10 @@ PACKAGE_STRING='RcppArmadillo 14.90.0-3'
620
621
PACKAGE_VERSION=' 14.90.0-4'
621
622
PACKAGE_STRING=' RcppArmadillo 14.90.0-4'
622
623
>>>>>>> 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)
623
628
PACKAGE_BUGREPORT=
' [email protected] '
624
629
PACKAGE_URL=' '
625
630
@@ -1240,6 +1245,7 @@ if test "$ac_init_help" = "long"; then
1240
1245
<<<<<<< HEAD
1241
1246
<<<<<<< HEAD
1242
1247
<<<<<<< HEAD
1248
+ <<<<<<< HEAD
1243
1249
'configure' configures RcppArmadillo 14.6.3-1 to adapt to many kinds of systems.
1244
1250
=======
1245
1251
'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
1250
1256
=======
1251
1257
'configure' configures RcppArmadillo 14.90.0-4 to adapt to many kinds of systems.
1252
1258
>>>>>>> 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)
1253
1262
1254
1263
Usage: $0 [OPTION]... [VAR=VALUE]...
1255
1264
@@ -1313,6 +1322,7 @@ if test -n "$ac_init_help"; then
1313
1322
case $ac_init_help in
1314
1323
<<<<<<< HEAD
1315
1324
<<<<<<< HEAD
1325
+ <<<<<<< HEAD
1316
1326
<<<<<<< HEAD
1317
1327
short | recursive ) echo " Configuration of RcppArmadillo 14.6.3-1:" ;;
1318
1328
=======
@@ -1324,6 +1334,9 @@ if test -n "$ac_init_help"; then
1324
1334
=======
1325
1335
short | recursive ) echo " Configuration of RcppArmadillo 14.90.0-4:" ;;
1326
1336
>>>>>>> 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)
1327
1340
esac
1328
1341
cat << \_ACEOF
1329
1342
@@ -1407,6 +1420,7 @@ if $ac_init_version; then
1407
1420
<<<<<<< HEAD
1408
1421
<<<<<<< HEAD
1409
1422
<<<<<<< HEAD
1423
+ <<<<<<< HEAD
1410
1424
RcppArmadillo configure 14.6.3-1
1411
1425
=======
1412
1426
RcppArmadillo configure 14.90.0-2
@@ -1417,6 +1431,9 @@ RcppArmadillo configure 14.90.0-3
1417
1431
=======
1418
1432
RcppArmadillo configure 14.90.0-4
1419
1433
>>>>>>> 0fca2ffa (RcppArmadillo 14.90.0-4)
1434
+ =======
1435
+ RcppArmadillo configure 14.90.0-5
1436
+ >>>>>>> 04a1d803 (RcppArmadillo 14.90.0-5)
1420
1437
generated by GNU Autoconf 2.72
1421
1438
1422
1439
Copyright (C) 2023 Free Software Foundation, Inc.
@@ -1535,6 +1552,7 @@ running configure, to aid debugging if configure makes a mistake.
1535
1552
<<<<<<< HEAD
1536
1553
<<<<<<< HEAD
1537
1554
<<<<<<< HEAD
1555
+ <<<<<<< HEAD
1538
1556
It was created by RcppArmadillo $as_me 14.6.3-1, which was
1539
1557
=======
1540
1558
It 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
1545
1563
=======
1546
1564
It was created by RcppArmadillo $as_me 14.90.0-4, which was
1547
1565
>>>>>>> 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)
1548
1569
generated by GNU Autoconf 2.72. Invocation command line was
1549
1570
1550
1571
$ $0 $ac_configure_args_raw
@@ -4046,6 +4067,7 @@ ac_log="
4046
4067
<<<<<<< HEAD
4047
4068
<<<<<<< HEAD
4048
4069
<<<<<<< HEAD
4070
+ <<<<<<< HEAD
4049
4071
This file was extended by RcppArmadillo $as_me 14.6.3-1, which was
4050
4072
=======
4051
4073
This 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
4056
4078
=======
4057
4079
This file was extended by RcppArmadillo $as_me 14.90.0-4, which was
4058
4080
>>>>>>> 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)
4059
4084
generated by GNU Autoconf 2.72. Invocation command line was
4060
4085
4061
4086
CONFIG_FILES = $CONFIG_FILES
@@ -4113,6 +4138,7 @@ ac_cs_version="\\
4113
4138
<<<<<<< HEAD
4114
4139
<<<<<<< HEAD
4115
4140
<<<<<<< HEAD
4141
+ <<<<<<< HEAD
4116
4142
RcppArmadillo config.status 14.6.3-1
4117
4143
=======
4118
4144
RcppArmadillo config.status 14.90.0-2
@@ -4123,6 +4149,9 @@ RcppArmadillo config.status 14.90.0-3
4123
4149
=======
4124
4150
RcppArmadillo config.status 14.90.0-4
4125
4151
>>>>>>> 0fca2ffa (RcppArmadillo 14.90.0-4)
4152
+ =======
4153
+ RcppArmadillo config.status 14.90.0-5
4154
+ >>>>>>> 04a1d803 (RcppArmadillo 14.90.0-5)
4126
4155
configured by $0 , generated by GNU Autoconf 2.72,
4127
4156
with options \\ "\$ ac_cs_config\\ "
4128
4157
0 commit comments