Skip to content
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

Remove civstatus #1275

Merged
merged 1 commit into from
Aug 15, 2022
Merged

Conversation

lmoureaux
Copy link
Contributor

The civstatus widget was introduced as a first-gen top bar, but never reached
maturity and is now superseded. Remove it.

Closes #1271.

@lmoureaux lmoureaux requested a review from jwrober August 15, 2022 00:07
@lmoureaux
Copy link
Contributor Author

May need an update of the main client screenshot.

@lmoureaux lmoureaux force-pushed the bugfix/drop-civstatus branch from b7750a8 to cf29cfe Compare August 15, 2022 00:48
@jwrober
Copy link
Collaborator

jwrober commented Aug 15, 2022

@lmoureaux - looks like I found the issue with patch, there is a conflict that needs resolved first.

@jwrober
Copy link
Collaborator

jwrober commented Aug 15, 2022

I was able to manually delete the files that the patch was trying to do. With that, the widget does go away and am able to compile with no issue.

The civstatus widget was introduced as a first-gen top bar, but never reached
maturity and is now superseded. Remove it.

Closes longturn#1271.
@lmoureaux lmoureaux force-pushed the bugfix/drop-civstatus branch from cf29cfe to cb7c6b2 Compare August 15, 2022 12:00
@lmoureaux lmoureaux enabled auto-merge (rebase) August 15, 2022 12:00
@lmoureaux
Copy link
Contributor Author

Conflict fixed

@lmoureaux lmoureaux merged commit 2c201dc into longturn:master Aug 15, 2022
@lmoureaux lmoureaux deleted the bugfix/drop-civstatus branch August 15, 2022 12:20
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Get rid of extraneous gold and science widget
2 participants