Skip to content

Commit

Permalink
After recovery
Browse files Browse the repository at this point in the history 
Most conflicts where line end chars
  • Loading branch information
@aphalo
aphalo committed Oct 8, 2023
1 parent 8e65d6a commit baa4d2c
Show file tree
Hide file tree
Showing 12 changed files with 288 additions and 10,576 deletions.
1,297 changes: 0 additions & 1,297 deletions R.data.containers.Rnw
View file

Large diffs are not rendered by default.

232 changes: 0 additions & 232 deletions R.intro.Rnw
View file

Large diffs are not rendered by default.

185 changes: 0 additions & 185 deletions R.learning.Rnw
View file

Large diffs are not rendered by default.

3,453 changes: 0 additions & 3,453 deletions R.plotting.Rnw
View file

Large diffs are not rendered by default.

1,733 changes: 0 additions & 1,733 deletions R.scripts.Rnw
View file

Large diffs are not rendered by default.

1,706 changes: 1 addition & 1,705 deletions R.stats.rnw
View file

Large diffs are not rendered by default.

200 changes: 49 additions & 151 deletions appendixes.prj
View file
Original file line number Diff line number Diff line change
@@ -1,189 +1,88 @@
<<<<<<< Updated upstream
36 Patch Control

1
1
1
using-r-main-crc.Rnw
30
17
6

rbooks.bib
BibTeX
1049586 2 878 52 878 55 38 38 1429 959 1 1 979 646 -1 -1 0 0 21 0 0 21 1 0 55 878 0 -1 0
references.bib
BibTeX
1049586 2 219 39 219 42 76 76 1467 997 1 1 784 748 -1 -1 0 0 23 0 0 23 1 0 42 219 0 -1 0
R.intro.Rnw
TeX:RNW
17838075 2 -1 25768 -1 25771 228 228 1214 1286 1 1 694 646 -1 -1 0 0 30 -1 -1 30 1 0 25771 -1 0 -1 0
preface.Rnw
TeX:RNW
1060859 2 -1 14693 -1 14696 266 266 1252 1324 1 1 1144 1258 -1 -1 0 0 18 -1 -1 18 1 0 14696 -1 0 -1 0
R.data.containers.Rnw
TeX:RNW
17838075 2 -1 83677 -1 83680 190 190 1324 1242 1 1 739 1292 -1 -1 0 0 31 -1 -1 31 3 0 83680 -1 1 192 -1 2 192 -1 0 -1 0
R.scripts.Rnw
TeX:RNW
17838075 2 -1 75273 -1 75200 152 152 1138 1210 1 1 169 646 -1 -1 0 0 31 -1 -1 31 3 0 75200 -1 1 58097 -1 2 65929 -1 0 -1 0
R.stats.rnw
TeX:RNW
286273531 0 -1 118669 -1 118674 418 418 1404 1476 1 1 949 680 -1 -1 0 0 31 -1 -1 31 1 0 118674 -1 0 -1 0
R.data.io.Rnw
TeX:RNW
17838075 2 -1 75305 -1 75308 494 494 1480 1522 1 1 799 646 -1 -1 0 0 31 -1 -1 31 1 0 75308 -1 0 -1 0
R.data.Rnw
TeX:RNW
17838075 1 -1 56413 -1 56430 342 342 1328 1400 1 1 1279 442 -1 -1 0 0 31 -1 -1 31 1 0 56430 -1 0 -1 0
using-r-main-crc.Rnw
TeX:RNW:UTF-8
134217730 0 190 13 190 17 6074 -1 6522 208 1 1 409 646 1 906 254 255 -1 0 0 33 1 0 17 190 0 -1 0
R.plotting.Rnw
TeX:RNW
17838075 2 -1 40487 -1 40490 380 380 1366 1438 1 1 739 476 -1 -1 0 0 31 -1 -1 31 1 0 40490 -1 0 -1 0
using-r-main-crc.ind
TeX:AUX:UNIX
1159154 7 824 33 824 39 308 308 1684 1215 1 0 715 646 -1 -1 0 0 17 0 0 17 1 0 39 824 0 0 0
usingr.sty
TeX:STY
1060850 2 148 2 148 5 190 190 1176 1248 1 0 205 646 -1 -1 0 0 25 0 0 25 1 0 5 148 0 0 0
abbrev.sty
TeX:STY
1060850 0 0 1 0 1 88 88 1471 1018 1 0 145 0 -1 -1 0 0 2 0 0 2 1 0 1 0 0 0 0
R.functions.Rnw
TeX:RNW
17838075 0 -1 11716 -1 11747 456 456 1442 1484 1 1 1624 -1462 -1 -1 0 0 31 -1 -1 31 1 0 11747 -1 0 -1 0
R.as.calculator.Rnw
TeX:RNW
17838075 1 -1 93302 -1 93316 190 190 1324 1242 1 1 1129 544 -1 -1 0 0 31 -1 -1 31 3 0 93316 -1 1 122277 -1 2 16955 -1 0 -1 0
R.learning.Rnw
TeX:RNW
17838075 0 -1 12615 -1 12622 304 304 1290 1362 1 1 1549 646 -1 -1 0 0 40 -1 -1 40 1 0 12622 -1 0 -1 0
using-r-main-crc.log
DATA:UNIX
307331314 2 7544 16 7544 19 440 440 1840 1347 1 0 415 646 -1 -1 0 0 117 0 0 117 1 0 19 7544 0 0 0
using-r-main-crc.tex
TeX
269496315 2 -1 4070 -1 4073 0 0 1400 907 1 1 409 1292 -1 -1 0 0 49 -1 -1 49 1 0 4073 -1 0 -1 0
:\Users\aphalo_2\Documents\RAnalyses\RFR-Viikki-field\data-2023-09-12\Viikki Tower_Public.dat
DATA
273678578 0 0 1 0 1 264 264 1647 1229 1 0 145 0 -1 -1 0 0 100 0 0 100 1 0 1 0 0 0 0
:\Users\aphalo_2\Documents\RAnalyses\RFR-Viikki-field\data-2023-09-12\Viikki Tower_DataTableInfo.dat
DATA
273678578 0 0 1 0 1 308 308 1691 1273 1 0 145 0 -1 -1 0 0 107 0 0 107 1 0 1 0 0 0 0
:\Users\aphalo_2\Documents\RAnalyses\RFR-Viikki-field\data-2023-09-12\Viikki Tower_Status.dat
DATA
273678578 0 0 1 0 1 352 352 1735 1317 1 0 145 0 -1 -1 0 0 100 0 0 100 1 0 1 0 0 0 0
:\Users\aphalo_2\Documents\RAnalyses\RFR-Viikki-field\data-2023-09-12\Viikki Tower_TableHour.dat
DATA
273678578 0 0 1 0 1 396 396 1779 1361 1 0 145 0 -1 -1 0 0 103 0 0 103 1 0 1 0 0 0 0
:\Users\aphalo_2\Documents\RAnalyses\RFR-Viikki-field\data-2023-09-12\Viikki Tower_TableDay.dat
DATA
273678578 0 0 1 0 1 440 440 1823 1405 1 0 145 0 -1 -1 0 0 102 0 0 102 1 0 1 0 0 0 0
:\Users\aphalo_2\Documents\RAnalyses\RFR-Viikki-field\data-2023-09-12\Viikki Tower_CPIStatus.dat
DATA
273678578 0 0 1 0 1 0 0 1383 930 1 0 145 0 -1 -1 0 0 103 0 0 103 1 0 1 0 0 0 0
:\Users\aphalo_2\Documents\RAnalyses\RFR-Viikki-field\data-2023-09-12\Viikki Tower_TableMinute.dat
DATA
273678578 0 0 1 0 1 44 44 1427 974 1 0 145 0 -1 -1 0 0 105 0 0 105 1 0 1 0 0 0 0
knitr.sty
TeX:STY
269496306 0 29 1 29 1 380 380 2073 1301 1 0 145 918 -1 -1 0 0 45 0 0 45 1 0 1 29 0 0 0
R.as.calculator.tex
TeX
269496315 0 -1 0 -1 0 76 76 1769 997 1 1 148 0 -1 -1 0 0 -1 -1 -1 -1 1 0 0 -1 0 0 0
krantz.cls
TeX:STY:UNIX
269594610 1 194 1 194 36 76 76 1062 1134 1 0 619 625 -1 -1 0 0 3 0 0 3 1 0 36 194 0 0 0
:\Users\Public\Desktop\Lenovo ThinkColor.lnk
DATA
273744114 0 0 1 2 1 190 190 1549 1111 1 0 129 50 -1 -1 0 0 -1 -1 -1 -1 1 0 1 2 0 0 0

*using-r-main-crc.Rnw
>
*rbooks.bib
*references.bib
*preface.Rnw
*R.learning.Rnw
*R.intro.Rnw
*R.as.calculator.Rnw
*R.data.containers.Rnw
*R.scripts.Rnw
*R.functions.Rnw
*R.stats.Rnw
*R.data.Rnw
*R.plotting.Rnw
*R.data.io.Rnw
<
=======
41 Patch Control

1
1
1
using-r-main-crc.Rnw
22
16
8
28
20
19

rbooks.bib
BibTeX
1049586 2 878 52 878 55 38 38 1429 959 1 1 848 783 -1 -1 0 0 21 0 0 21 1 0 55 878 0 -1 0
BibTeX:UNIX
1147890 0 959 1 959 1 38 38 1429 959 1 1 146 1334 -1 -1 0 0 1 1 1 1 1 0 1 959 0 -1 0
references.bib
BibTeX
1049586 2 219 39 219 42 76 76 1467 997 1 1 679 783 -1 -1 0 0 23 0 0 23 1 0 42 219 0 -1 0
BibTeX:UNIX
1147890 0 0 1 0 1 76 76 1467 997 1 1 146 0 -1 -1 0 0 1 1 1 1 1 0 1 0 0 -1 0
R.intro.Rnw
TeX:RNW
17838075 2 -1 36492 -1 36496 228 228 1214 1286 1 1 1017 1363 -1 -1 0 0 30 -1 -1 30 1 0 36496 -1 0 -1 0
17837307 0 -1 0 -1 0 228 228 1358 1175 1 1 146 0 -1 -1 0 0 -1 -1 -1 -1 1 0 0 -1 0 -1 0
preface.Rnw
TeX:RNW
1060859 2 -1 13719 -1 13723 266 266 1252 1324 1 1 1212 870 -1 -1 0 0 18 -1 -1 18 1 0 13723 -1 0 -1 0
TeX:RNW:UNIX
1159163 0 326 34 -1 14696 266 266 1252 1324 1 1 614 928 -1 -1 0 0 18 -1 -1 18 1 0 14696 -1 0 -1 0
R.data.containers.Rnw
TeX:RNW:UNIX
17936379 0 -1 82947 -1 82947 190 190 1324 1242 1 1 146 812 -1 -1 0 0 82947 -1 -1 82947 3 0 82947 -1 1 0 -1 2 0 -1 0 -1 0
R.data.containers-2.Rnw
TeX:RNW
17838075 2 -1 83677 -1 83680 190 190 1324 1242 1 1 640 928 -1 -1 0 0 31 -1 -1 31 3 0 83680 -1 1 192 -1 2 192 -1 0 -1 0
17837307 0 -1 0 -1 0 266 266 1396 1213 1 1 146 0 -1 -1 0 0 -1 -1 -1 -1 1 0 0 -1 0 -1 0
R.scripts.Rnw
TeX:RNW:UNIX
17936379 0 -1 110983 -1 0 152 152 1138 1210 1 1 146 0 -1 -1 0 0 110983 -1 -1 110983 3 0 0 -1 1 0 -1 2 68 411 0 -1 0
R.scripts-2.Rnw
TeX:RNW
17838075 0 -1 98190 -1 98669 152 152 1138 1210 1 1 341 232 -1 -1 0 0 31 -1 -1 31 3 0 98669 -1 1 58097 -1 2 65929 -1 0 -1 0
17837307 0 -1 0 -1 0 304 304 1434 1251 1 1 146 0 -1 -1 0 0 -1 -1 -1 -1 1 0 0 -1 0 -1 0
R.stats.rnw
TeX:RNW:UNIX
17936379 0 -1 127497 -1 127497 418 418 1404 1476 1 1 146 1334 -1 -1 0 0 127497 -1 -1 127497 1 0 127497 -1 0 -1 0
R.stats-2.rnw
TeX:RNW
17838075 0 1703 169 -1 118674 418 418 1404 1476 1 1 835 1392 -1 -1 0 0 31 -1 -1 31 1 0 118674 -1 0 -1 0
17837307 0 -1 0 -1 0 342 342 1472 1289 1 1 146 0 -1 -1 0 0 -1 -1 -1 -1 1 0 0 -1 0 -1 0
R.data.io.Rnw
TeX:RNW
17838075 2 -1 75305 -1 75308 494 494 1480 1522 1 1 692 899 -1 -1 0 0 31 -1 -1 31 1 0 75308 -1 0 -1 0
TeX:RNW:UNIX
17936379 0 -1 75244 -1 75244 494 494 1480 1522 1 1 146 899 -1 -1 0 0 31 -1 -1 31 1 0 75244 -1 0 -1 0
R.data.Rnw
TeX:RNW
286273531 0 -1 13452 -1 17241 342 342 1328 1400 1 1 406 638 -1 -1 0 0 31 -1 -1 31 1 0 17241 -1 0 -1 0
TeX:RNW:UNIX
17936379 0 1618 66 -1 12290 342 342 1328 1400 1 1 939 203 -1 -1 0 0 31 -1 -1 31 1 0 12290 -1 0 -1 0
using-r-main-crc.Rnw
TeX:RNW:UTF-8
134217730 0 190 13 2 19 6074 -1 6522 208 1 1 380 58 1 906 254 255 -1 0 0 33 1 0 19 2 0 -1 0
134217730 0 190 13 197 1 6074 -1 6522 208 1 1 146 290 1 906 254 255 -1 0 0 33 1 0 1 197 0 -1 0
R.plotting.Rnw
TeX:RNW
17838075 2 -1 40487 -1 40490 380 380 1366 1438 1 1 640 928 -1 -1 0 0 31 -1 -1 31 1 0 40490 -1 0 -1 0
TeX:RNW:UNIX
17936379 0 -1 249401 -1 249401 380 380 1366 1438 1 1 146 1334 -1 -1 0 0 249401 -1 -1 249401 1 0 249401 -1 0 -1 0
usingr.sty
TeX:STY
1060850 1 93 21 93 31 190 190 1176 1248 1 0 515 986 -1 -1 0 0 25 0 0 25 1 0 31 93 0 0 0
1158386 0 0 1 0 1 190 190 1176 1248 1 0 125 0 -1 -1 0 0 1 1 1 1 1 0 1 0 0 0 0
usingr-2.sty
TeX
1060091 0 -1 0 -1 11649 152 152 1282 1099 1 0 125 1305 -1 -1 0 0 -1 -1 -1 -1 1 0 11649 -1 0 0 0
abbrev.sty
TeX:STY
1060850 0 0 1 0 1 88 88 1471 1018 1 0 125 0 -1 -1 0 0 2 0 0 2 1 0 1 0 0 0 0
1060850 0 0 1 0 1 88 88 1471 1018 1 0 125 -5829 -1 -1 0 0 2 0 0 2 1 0 1 0 0 0 0
R.functions.Rnw
TeX:RNW
17838075 0 -1 45813 -1 45813 456 456 1442 1484 1 1 952 957 -1 -1 0 0 31 -1 -1 31 1 0 45813 -1 0 -1 0
TeX:RNW:UNIX
17936379 0 -1 11716 -1 11747 456 456 1442 1484 1 1 562 -19111 -1 -1 0 0 31 -1 -1 31 1 0 11747 -1 0 -1 0
R.as.calculator.Rnw
TeX:RNW
17838075 1 -1 93302 -1 93316 190 190 1324 1242 1 1 978 928 -1 -1 0 0 31 -1 -1 31 3 0 93316 -1 1 122277 -1 2 16955 -1 0 -1 0
TeX:RNW:UNIX
17936379 0 -1 93302 -1 93316 190 190 1324 1242 1 1 159 928 -1 -1 0 0 31 -1 -1 31 3 0 93316 -1 1 146577 -1 2 58 486 0 -1 0
R.learning.Rnw
TeX:RNW
17838075 0 -1 15791 -1 15794 304 304 1290 1362 1 1 718 812 -1 -1 0 0 40 -1 -1 40 1 0 15794 -1 0 -1 0
:\Program Files\MiKTeX\tex\latex\unicode-math\unicode-math.sty
TeX:STY:LaTeX3:UNIX
269593842 7 40 1 39 1 228 228 1358 1175 1 0 125 1131 -1 -1 0 0 -1 -1 -1 -1 1 0 1 39 0 0 0
17837307 0 -1 0 -1 309 190 190 1320 1137 1 1 770 174 -1 -1 0 0 -1 -1 -1 -1 1 0 309 -1 0 -1 0
using-r-main-crc.ind
TeX:AUX:UNIX
269594610 7 824 33 824 39 308 308 1684 1215 1 0 619 783 -1 -1 0 0 17 0 0 17 1 0 39 824 0 0 0
269594610 0 824 33 824 39 308 308 1684 1215 1 0 619 638 -1 -1 0 0 17 0 0 17 1 0 39 824 0 0 0
R.intro-2.Rnw
TeX:RNW
286272763 0 -1 0 -1 0 228 228 1358 1175 1 1 146 0 -1 -1 0 0 -1 -1 -1 -1 1 0 0 -1 0 -1 0
R.learning-2.Rnw
TeX:RNW
286272763 0 -1 0 -1 0 190 190 1320 1137 1 1 146 0 -1 -1 0 0 -1 -1 -1 -1 1 0 0 -1 0 -1 0
using-r-main-crc.log
DATA:UNIX
307331314 2 7544 16 7544 19 440 440 1840 1347 1 0 415 646 -1 -1 0 0 117 0 0 117 1 0 19 7544 0 0 0
using-r-main-crc.tex
TeX
269496315 2 -1 4070 -1 4073 0 0 1400 907 1 1 409 1292 -1 -1 0 0 49 -1 -1 49 1 0 4073 -1 0 -1 0
knitr.sty
TeX:STY
269496306 0 29 1 29 1 380 380 2073 1301 1 0 145 918 -1 -1 0 0 45 0 0 45 1 0 1 29 0 0 0
Expand All @@ -210,4 +109,3 @@ TeX:STY:UNIX
*R.plotting.Rnw
*R.data.io.Rnw
<
>>>>>>> Stashed changes
Loading

0 comments on commit baa4d2c

Please sign in to comment.