it was merged with conflicts

On 13 August 2016 at 20:43, zero-24 notifications@github.com wrote:

Steps to reproduce the issue

see: 0f22f7d
0f22f7d
Expected result

sample_testing.sql works
Actual result

sample_testing.sql don't works
Additional comments

@brianteeman https://github.com/brianteeman @wilsonge
https://github.com/wilsonge please double check the last commit this
file:

https://github.com/joomla/joomla-cms/blob/0f22f7d7c35e114aab6cd09e9134a1
3ff26059bd/installation/sql/mysql/sample_testing.sql

—
You are receiving this because you were mentioned.
Reply to this email directly, view it on GitHub
#11591, or mute the thread
https://github.com/notifications/unsubscribe-auth/ABPH8d0TnYKNAE94utcPVLFyFKGY87b9ks5qfh5pgaJpZM4Jjvur
.

Brian Teeman
Co-founder Joomla! and OpenSourceMatters Inc.
http://brian.teeman.net/

Correct. Can you double check which is the correct?

Oops 1fd0687

Thanks

On 13 August 2016 at 21:13, George Wilson notifications@github.com wrote:

Closed #11591 #11591.

—
You are receiving this because you were mentioned.
Reply to this email directly, view it on GitHub
#11591 (comment), or mute
the thread
https://github.com/notifications/unsubscribe-auth/ABPH8fHMZrX2YBp1Q0aIe4hab2xT5gKaks5qfiVfgaJpZM4Jjvur
.

Brian Teeman
Co-founder Joomla! and OpenSourceMatters Inc.
http://brian.teeman.net/