Skip to content
Snippets Groups Projects
Commit c5fbda46 authored by David Hoese's avatar David Hoese
Browse files

Resolve readme conflict

parents eebed4d6 278e7449
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
README.md
+ 1
− 0
View file @ c5fbda46
# countries # countries
France France
united states
united_states.txt 0 → 100644
+ 2
− 0
View file @ c5fbda46
Population: 325,700,000
Capitol: Washington DC
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment