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

Pre-merge Cleanup #2816

Merged
merged 2 commits into from
Feb 22, 2022
Merged

Pre-merge Cleanup #2816

merged 2 commits into from
Feb 22, 2022

Conversation

martinmaly
Copy link
Contributor

  • Tidy go modules
  • Fix year in license header

* Tidy go modules
* Fix year in license header
@martinmaly
Copy link
Contributor Author

@droot If your preference is to merge this cleanup into porch branch before merging porch into main, let's merge this PR first and I'll re-do the merge porch --> main PR.
Otherwise I can also merge the big PR first and then do this after. LMK

Fixing few more issues that crept in during merges from main and
preparing for merge back to main.
site/sidebar.md Show resolved Hide resolved
@droot
Copy link
Contributor

droot commented Feb 22, 2022

@droot If your preference is to merge this cleanup into porch branch before merging porch into main, let's merge this PR first and I'll re-do the merge porch --> main PR. Otherwise I can also merge the big PR first and then do this after. LMK

Since it's a minor cleanup, I would prefer doing it after our big PR merge. Will be reviewing the big PR soon.

@martinmaly martinmaly merged commit 881b7f0 into kptdev:porch Feb 22, 2022
@martinmaly martinmaly deleted the tidy branch February 22, 2022 17:19
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.

2 participants