Closed afa7789 closed 6 years ago
Vou resolver esses conflitos já já , não tinha visto esses apesar de ter olhado :/
https://www.avast.com/sig-email?utm_medium=email&utm_source=link&utm_campaign=sig-email&utm_content=webmail Livre de vírus. www.avast.com https://www.avast.com/sig-email?utm_medium=email&utm_source=link&utm_campaign=sig-email&utm_content=webmail. <#DAB4FAD8-2DD7-40BB-A1B8-4E2AA1F9FDF2>
2017-12-01 13:59 GMT-02:00 Flávio Coutinho notifications@github.com:
@fegemo requested changes on this pull request.
@afa7789 https://github.com/afa7789 verificar os problemas identificados na revisão.
In core/src/br/cefetmg/games/minigames/ClickFindCat.java https://github.com/fegemo/cefet-games-meow-au/pull/119#discussion_r154379486 :
- public void checkCatRatDistance() {
- for (Rat Rato : ratos) {
Nome de variável em maiúsculas :(((
In core/assets/data/ProgressFile.txt https://github.com/fegemo/cefet-games-meow-au/pull/119#discussion_r154379544 :
@@ -0,0 +1,9 @@ +<<<<<<< HEAD
Arquivo com conflitos não resolvidos...
In .gitignore https://github.com/fegemo/cefet-games-meow-au/pull/119#discussion_r154379605 :
@@ -70,8 +70,19 @@ build/ .DS_Store Thumbs.db
+ +core/assets/data/ProgressFile.txt + +*.txt +<<<<<<< HEAD
Arquivo com conflitos não resolvidos...
In core/src/br/cefetmg/games/screens/OverworldScreen.java https://github.com/fegemo/cefet-games-meow-au/pull/119#discussion_r154379844 :
@@ -288,6 +288,23 @@ protected void assetsLoaded() { cadeado.setScale(0.5f); i++; } +//<<<<<<< refs/remotes/fegemo/master
Arquivo com conflitos não resolvidos...
— You are receiving this because you were mentioned. Reply to this email directly, view it on GitHub https://github.com/fegemo/cefet-games-meow-au/pull/119#pullrequestreview-80537982, or mute the thread https://github.com/notifications/unsubscribe-auth/AZpGF8J6BI1Ivb4WGSFTvrX5lj4VoZVmks5s8CJFgaJpZM4Qwo4r .
Acha que agora foi Coutinho
@afa7789 pull request recebido
#18 Consertar o MiniGame ClickFindCat