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

To address the entire 2021 backlog of CCG minutes #71

Open
wants to merge 8 commits into
base: main
Choose a base branch
from

Conversation

bumblefudge
Copy link
Contributor

No description provided.

@bumblefudge bumblefudge changed the title To address the entire Spruce Systems 2021 backlog of CCG minutes To address the entire 2021 backlog of CCG minutes Aug 30, 2021
@vsnt
Copy link
Contributor

vsnt commented Oct 29, 2021

Hey @bumblefudge can you resolve the people.json file conflicts? Thanks!

@bumblefudge
Copy link
Contributor Author

Very embarassing, just saw this now!

@bumblefudge
Copy link
Contributor Author

... and added yesterday's minutes as well because I can't seem to manage multiple branches at once 🤦‍♀️

@bumblefudge
Copy link
Contributor Author

No description provided.

@bumblefudge
Copy link
Contributor Author

bumblefudge commented Dec 14, 2021

Today's minutes are almost ready to go as well, but for some reason, the audio from the meeting (which ended 45min ago) never popped up in its usual place ? Otherwise ready to go, feel free to ping me here (or just add in the commit yourselves!) when the OGG materializes.

@BigBlueHat
Copy link
Collaborator

@bumblefudge I'm cleaning house in this repo, and would be happy to get this merged. The conflicts look easy to resolve except the one that removes the Agenda: line. Do you recall why that was removed? The others all seem like text corrections which you've done on your branch (thank you!).

Let me know if we should keep or remove that Agenda: line, and I'll merge accordingly.

Cheers!
🎩

@bumblefudge
Copy link
Contributor Author

no idea about that agenda line-- i kept it when merging all the other conflicts, but feel free to take it out again if there's any reason to. maybe the automation injects it automatically making this in-line link redundant? whatever the case, thanks for cleaning it up!

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.

3 participants