Skip to content

Images same horizontal line #117 - #122

Merged
hkaur008 merged 2 commits into
CodeFlowOrg:masterfrom
RashiSingh20:feature
Oct 13, 2021
Merged

hkaur008 merged 2 commits into
CodeFlowOrg:masterfrom
RashiSingh20:feature

Conversation

@RashiSingh20

Copy link
Copy Markdown
Contributor

Screenshot (985)

@RashiSingh20

Copy link
Copy Markdown
Contributor Author

Please check the updated code, I have attached a screenshot as well.

@RashiSingh20

Copy link
Copy Markdown
Contributor Author

@hkaur008 Please merge my code.

@hkaur008

Copy link
Copy Markdown
Contributor

conflicting

@RashiSingh20

Copy link
Copy Markdown
Contributor Author

Should I push the code without the node modules, if that's creating an issue.?

@RashiSingh20

Copy link
Copy Markdown
Contributor Author

I have just made changes to the CSS file of the teamcard. And the conflict is resolved. Now it can be merged.

@hkaur008

hkaur008 commented Oct 12, 2021 via email

Copy link
Copy Markdown
Contributor

@hkaur008
hkaur008 merged commit e54501b into CodeFlowOrg:master Oct 13, 2021
@hkaur008 hkaur008 added the hacktoberfest-accepted Accepted for hacktoberfest by maintainer label Oct 13, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

hacktoberfest-accepted Accepted for hacktoberfest by maintainer

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants