这是indexloc提供的服务,不要输入任何密码
Skip to content

Conversation

@antixcode6
Copy link

I think I finally dug myself out of the hole I created with that last pull request @swapagarwal

Created new branch for this pull request containing only weather.py init.py and test_weather.py for the weather module


Maybe I'm finally starting to get Git
@swapagarwal swapagarwal mentioned this pull request Apr 28, 2016
@swapagarwal
Copy link
Owner

swapagarwal commented Apr 28, 2016

Great! 🎉
I promise this is the last change before merging, can you run the following commands?
git reset 2c988b974133e35099e5ad8e9928ad97bfcc015c --hard
git fetch upstream
git checkout master
git merge upstream/master
Then add the two weather files and add the corresponding line in __init__.py
Your fork is out of sync, that's why there are merge conflicts!

@swapagarwal
Copy link
Owner

Hey @antixcode6 , will you be willing to complete this? 😄

@shnupta
Copy link
Contributor

shnupta commented Jun 7, 2016

@swapagarwal Hey there, seen as you've yet to get a reply from the original pr submitter I've decided to take on his code. Just adapting it now!:)

@shnupta shnupta mentioned this pull request Jun 7, 2016
@swapagarwal
Copy link
Owner

Continued in #76

@shnupta
Copy link
Contributor

shnupta commented Jun 8, 2016

Changed to #79

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.

3 participants