Skip to content

Conversation

@tony2001
Copy link
Contributor

@tony2001 tony2001 commented Jun 3, 2016

Please add the following conf announcement to the calendar

@bjori
Copy link
Member

bjori commented Jun 3, 2016

/cc @EliW

@EliW
Copy link
Contributor

EliW commented Jun 3, 2016

Don't look like the image file was included, nor the updates to archive.xml Can you commit those changes in @tony2001 ... We need all three files to make an entry.

@tony2001
Copy link
Contributor Author

tony2001 commented Jun 3, 2016

The image is there: images/news/devconfru2012.png
I'll commit the other file in a moment

@EliW
Copy link
Contributor

EliW commented Jun 3, 2016

@tony2001 That last change has merge conflicts. It looks like instead of using the tool (/bin/createNewsEntry) to make this ... that you did it by hand?

and/or you did it against an older branch that was missing some of the latest updates. Can you please fix and submit again?

@tony2001
Copy link
Contributor Author

tony2001 commented Jun 6, 2016

Ok, done

@tony2001
Copy link
Contributor Author

tony2001 commented Jun 6, 2016

@EliW could you merge it now, plz?

@php-pulls php-pulls merged commit 08b4b7c into php:master Jun 6, 2016
@EliW
Copy link
Contributor

EliW commented Jun 6, 2016

Done :)

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.

4 participants