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

Updating Water category #28

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

Conversation

Frenzyritz13
Copy link
Contributor

No description provided.

@nglgzz
Copy link
Owner

nglgzz commented Oct 8, 2019

Hey @Frenzyritz13

Could you rebase your branch so conflicts will be resolved?

Running the following commands should do the trick:

git remote add upstream https://github.com/nglgzz/awesome-clean-tech
git fetch upstream
git rebase upstream/master
git push --force-with-lease origin master

@nglgzz nglgzz mentioned this pull request Oct 20, 2019
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.

None yet

3 participants