Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master' into airtable
Browse files Browse the repository at this point in the history
# Conflicts:
#	president-travels/carter-jimmy.xml
#	president-travels/ford-gerald-r.xml

Resolved conflicts using correct spelling of Park’s name (now also in DOA).
  • Loading branch information
joewiz committed Sep 18, 2024
2 parents 326b5f3 + bc0e26e commit e655e85
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion president-travels/carter-jimmy.xml
Original file line number Diff line number Diff line change
Expand Up @@ -365,7 +365,7 @@
<end-date>1979-07-01</end-date>
<country id="korea-south">Korea, Republic of</country>
<locale>Seoul</locale>
<remarks>State visit; met with President Chung Hee Park and Prime Minister Choi Kyu
<remarks>State visit; met with President Park Chung Hee and Prime Minister Choi Kyu
Hah.</remarks>
<created-by>wicentowskijc</created-by>
<created-datetime>2010-02-27T14:35:48.889-04:00</created-datetime>
Expand Down
2 changes: 1 addition & 1 deletion president-travels/ford-gerald-r.xml
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
<end-date>1974-11-23</end-date>
<country id="korea-south">Korea, Republic of</country>
<locale>Seoul</locale>
<remarks>Met with President Chung Hee Park.</remarks>
<remarks>Met with President Park Chung Hee.</remarks>
<created-by>wicentowskijc</created-by>
<created-datetime>2010-02-27T14:35:48.889-04:00</created-datetime>
<last-modified-by>bottsjd</last-modified-by>
Expand Down

0 comments on commit e655e85

Please sign in to comment.