Skip to content

Comments

Stepper fix#1027

Merged
douglascamata merged 5 commits intoPokemonGoF:devfrom
Phil9l:stepper_fix
Jul 26, 2016
Merged

Stepper fix#1027
douglascamata merged 5 commits intoPokemonGoF:devfrom
Phil9l:stepper_fix

Conversation

@Phil9l
Copy link
Contributor

@Phil9l Phil9l commented Jul 26, 2016

Fixes:

  • Using os.path.join instead of / in file paths,
  • Handling location files opening with try

@douglascamata
Copy link
Member

LGTM

@solderzzc
Copy link
Contributor

@douglascamata you up Lmao.

@douglascamata
Copy link
Member

@solderzzc lol, I'm excited to work.... LET'S WWWWOOOORK!

@douglascamata
Copy link
Member

douglascamata commented Jul 26, 2016

DLGTMA (doesn't look good to me anymore)

@Phil9l
Copy link
Contributor Author

Phil9l commented Jul 26, 2016

@douglascamata,why doesn't?

@douglascamata
Copy link
Member

@Phil9l because you have a merge conflict with dev branch. You need to git pull origin dev and fix the conflicts.

@Phil9l
Copy link
Contributor Author

Phil9l commented Jul 26, 2016

@douglascamata, updated. No conflicts now.

@douglascamata
Copy link
Member

@solderzzc please review again, now it definitely LGTM.

@douglascamata
Copy link
Member

@Phil9l fuck the police, man, I'm merging you.

@douglascamata douglascamata merged commit f0a5a18 into PokemonGoF:dev Jul 26, 2016
MFizz pushed a commit to MFizz/PokemonGo-Bot that referenced this pull request Jul 29, 2016
* Handling file opening errors and and updated pathes

* Removed extra blank line

* Fixed error text

* Adding nickname to contributors file
hoanghuynh pushed a commit to hoanghuynh/PokemonGo-Bot that referenced this pull request Sep 28, 2016
hoanghuynh pushed a commit to hoanghuynh/PokemonGo-Bot that referenced this pull request Sep 28, 2016
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