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

gigablast support added #364

Closed

Conversation

starlord1311
Copy link
Contributor

@starlord1311 starlord1311 commented Dec 5, 2017

Fixes #

Checklist

  • I have read the Contribution & Best practices Guide and my PR follows them.
  • My branch is up-to-date with the Upstream master branch.
  • I have added necessary documentation (if appropriate)

Changes proposed in this pull request:

-made a new pr. but the icon for gigablast still cant be seen. otherwise the server is working properly locally

@starlord1311
Copy link
Contributor Author

@bhaveshAn @raju249 please check

@bhaveshAn
Copy link
Member

Resolve conflicts and Please provide heroku deployment

@starlord1311
Copy link
Contributor Author

@bhaveshAn can you please tell what the conflicts are. i am not getting it.

@raju249
Copy link
Contributor

raju249 commented Dec 5, 2017

Follow these steps @starlord1311
Do git fetch upstream (Upstream being remote pointing to this repo)
Then merge the master branch using git merge upstream/master
then do a git push

@starlord1311
Copy link
Contributor Author

thanks @raju249

@starlord1311
Copy link
Contributor Author

@raju249 can you help with heroku deployment?

@starlord1311
Copy link
Contributor Author

i have windows

@raju249
Copy link
Contributor

raju249 commented Dec 5, 2017

Sure @starlord1311
Ping me on gitter, or else the issue page may get long to scroll with comments :smi

Remorax pushed a commit to Remorax/query-server that referenced this pull request Jan 14, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants