search

olegkrivtsov / using-zend-framework-3-book

A free and reader-friendly book on Zend Framework 3
https://olegkrivtsov.github.io/using-zend-framework-3-book/html
Other
162 stars 63 forks source link

Patch 3 #73

Closed ASponch closed 5 years ago

ASponch commented 5 years ago

In french, we said "Programmation orientée objet" (= POO) instead of "Oriented programmation objet" (= OOP)

ASponch commented 5 years ago

For the same reason as the previous PR, the modification is on line 28.

olegkrivtsov commented 5 years ago

Hey @ASponch, could you please check for merging conflicts in your pull request? I'm not sure how to resolve them myself. Please feel free to ask if you have any questions. :)

ASponch commented 5 years ago

That's done :)

olegkrivtsov commented 5 years ago

Hey @ASponch, I see from the Files changed, that you use tabs instead of 4 spaces, can you please fix that? If you have any questions, please ask.

ASponch commented 5 years ago

Hello @olegkrivtsov, I think that was good now.

olegkrivtsov commented 5 years ago

Hey @ASponch, sorry, but I still see unresolved conflicts. Can you please re-check?

olegkrivtsov commented 5 years ago

Closing since it has unresolved conflicts.

ASponch commented 5 years ago

Sorry, I'm late. I work on an other project and put stand by my ZF3 reading. Maybe in the future :)