Add ACTCO2S keyword to PROPS section for 2024-04

[gdfldm]

This replaces #235 Only the formatting has been changed

[gdfldm]

@blattms, @hakonhagland. I am trying to work out why these PRs are creating conflicts. It looks to me that if you add one new keyword (ACF) then add another new keyword (ACTCO2S) before merging the first a conflict is created. The diff for the second keyword looks like it is trying to replace the first new keyword with the second new keyword (rather than simply adding a new keyword).

--- a/keyword-names/8.3/keywords.txt
+++ b/keyword-names/8.3/keywords.txt
@@ -1,4 +1,4 @@
-ACF
+ACTCO2S
 ADD
 ADDREG
 ADSALNOD

rename from parts/chapters/subsections/8.3/ACF.fodt
rename to parts/chapters/subsections/8.3/ACTCO2S.fodt
index 515c1330..d57d4a73 100644
--- a/parts/chapters/subsections/8.3/ACF.fodt
+++ b/parts/chapters/subsections/8.3/ACTCO2S.fodt
@

Does git get confused because the two keywords are being inserted into the list at the same point?

[hakonhagland]

I am trying to work out why these PRs are creating conflicts.

@gdfldm If I try to rebase this PR on main, I see conflicts as you described. For example keyword-names/8.3/keywords.txt shows the following conflict:

<<<<<<< HEAD
ACF
=======
ACTCO2S
>>>>>>> f17144b (Add ACTCO2S as supported)
ADD
ADDREG
ADSALNOD
ADSORP
ALKADS
....

I think this is only because the ACF keyword (in branch main) and the added keyword ACTCO2S in this PR are located alphabetically at the same position in the keywords.txt file and it appears you did not rebase this PR on the main (or alternatively, included the PR that included the ACF keyword in this PR). So Git does not know if you want to delete the ACF keyword or not.