Skip to content

Added lines to yadayada#9

Open
Blubberpie wants to merge 3 commits into
KrityaLee:masterfrom
Blubberpie:master
Open

Added lines to yadayada#9
Blubberpie wants to merge 3 commits into
KrityaLee:masterfrom
Blubberpie:master

Conversation

@Blubberpie

Copy link
Copy Markdown

-Added "Zwel Pai" to yadayada.txt in the foobar branch
-Added "Name added" to yadayada.txt in master branch
-Merged foobar into master
-Commited, preserved both changes, conflicts resolved

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.

1 participant