Skip to content

Remove typo vid namespace in shapes sample - #84

Closed
jopadan wants to merge 5 commits into
dogo:masterfrom
jopadan:master
Closed

jopadan wants to merge 5 commits into
dogo:masterfrom
jopadan:master

Conversation

@jopadan

@jopadan jopadan commented Aug 30, 2025

Copy link
Copy Markdown

No description provided.

@dogo

dogo commented Sep 1, 2025

Copy link
Copy Markdown
Owner

Hi @jopadan !
Could you please resolve the merge conflicts between your branch and the upstream master? The pull request cannot be merged automatically until these conflicts are fixed.
Let me know if you need any help!

@jopadan

jopadan commented Sep 3, 2025 •

Copy link
Copy Markdown
Author

There don't seem to be any conflicts with the master base branch. Please specify the line of code/file.
Do you mean the http://scenemusic.net http://pmaster.no:9000/necta mirrors?

@dogo

dogo commented Sep 4, 2025

Copy link
Copy Markdown
Owner

@jopadan Could you please update your branch with the latest changes from the upstream master branch?

@dogo

dogo commented Sep 5, 2025

Copy link
Copy Markdown
Owner

Merged manually into master.
There was a conflict in .gitignore, which I resolved during the merge.

@dogo dogo closed this Sep 5, 2025
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