-
-
Notifications
You must be signed in to change notification settings - Fork 2.7k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Add Walling, Tennessee, USA #861
Conversation
@mtsfer The id should be 920 instead of 720 |
@mtsfer Please rebase the branch as id now should be 921 |
@mtsfer I can still see the conflict. Can you please rebase it again? |
@mtsfer Please resolve conflicts. |
@dr5hn Sorry! What about now? |
sql/world.sql
Outdated
@@ -151285,8 +151285,9 @@ INSERT INTO `cities` (`id`, `name`, `state_id`, `state_code`, `country_id`, `cou | |||
(153918, 'Hermitage', 3263, 'PW', 140, 'MU', -20.27685080, 57.53471370, '2019-10-05 23:08:25', '2024-09-07 19:08:44', 1, 'Q246286'), | |||
(153919, 'Marshall', 1400, 'AK', 233, 'US', 61.87811100, 162.08500000, '2024-09-07 18:24:01', '2024-09-07 18:24:01', 1, 'Q79550'), | |||
(153920, 'Berlin', 1435, 'CT', 233, 'US', 41.622234, -72.773628, '2024-09-27 15:00:00', '2024-09-27 15:00:00', 1, 'Q821199'), | |||
(153921, 'Stratford', 4069, 'TKI', 158, 'NZ', -39.32215170, 174.26298160, '2024-10-05 16:08:24', '2024-10-05 16:08:24', 1, 'Q1972491'), | |||
(153921, 'Stratford', 4069, 'TKI', 158, 'NZ', -39.32215170, 174.26298160, '2024-10-05 16:08:24', '2024-10-05 16:08:24', 1, 'Q1972491'); |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
should be ,
at the end.
commit is messed up! |
Nah, let me close this and open a new one 🥲. Zed smh deleted everything |
Reference: https://en.wikipedia.org/wiki/Walling,_Tennessee
Closes #673