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

FIX. deprecated getchildren() as lxml 2.0 #6

Merged
merged 2 commits into from
Feb 6, 2012
Merged

Conversation

cpey
Copy link
Contributor

@cpey cpey commented Feb 6, 2012

No description provided.

@ecarreras
Copy link
Member

wow, em diu que no pot fer merge automàtic... això és mal senyal :(

Abans de fer canvis has fet pull i tot? perquè és molt extrany que no pugui aplicar els canvis netament.

@cpey
Copy link
Contributor Author

cpey commented Feb 6, 2012

@ecarreras no havia fet el pull ^_^

Conflicts:
	switching/messages/F1.py
@ecarreras
Copy link
Member

Ara ja pinta millor ;-) has provat les iteracions i va bé? suposo que donarà conflicte amb la branca on estic desenvolupant jo, però bueno és normal perquè editem gairebé les mateixes parts.

Si l'iterador funciona perfecte per mi ja es pot integrar :)

@cpey cpey closed this Feb 6, 2012
@cpey cpey reopened this Feb 6, 2012
@cpey
Copy link
Contributor Author

cpey commented Feb 6, 2012

Hooray!

@cpey cpey merged this pull request into developer Feb 6, 2012
@ecarreras ecarreras deleted the deprecations branch December 30, 2013 15:56
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants