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

Material icon #217

Merged
merged 3 commits into from
Apr 20, 2018
Merged

Material icon #217

merged 3 commits into from
Apr 20, 2018

Conversation

tech4GT
Copy link
Member

@tech4GT tech4GT commented Apr 19, 2018

@jywarren in concert with #211

tech4GT added 2 commits April 20, 2018 02:01
Signed-off-by: tech4GT <varun.gupta1798@gmail.com>
Signed-off-by: tech4GT <varun.gupta1798@gmail.com>
@jywarren
Copy link
Member

Depending on how big this is, do you want to exclude the icons in package.json? Or not, just an idea. Thanks!!!

@tech4GT
Copy link
Member Author

tech4GT commented Apr 20, 2018

@jywarren Sorry i didn't understand? This icon will be useful for the demo so maybe it's not required in package.json , is this what you're asking?

@jywarren
Copy link
Member

jywarren commented Apr 20, 2018 via email

@tech4GT
Copy link
Member Author

tech4GT commented Apr 20, 2018

@jywarren oh that makes sense, so this is ready to merge right or something else?
Thanks

@jywarren
Copy link
Member

It's ready but there is a merge conflict right now -- can you rebase or resolve? thanks!!!

@tech4GT
Copy link
Member Author

tech4GT commented Apr 20, 2018

@jywarren done👍

@jywarren jywarren merged commit 98f913b into publiclab:master Apr 20, 2018
@jywarren
Copy link
Member

Perfect. Done!!!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants