? Success

User tests: Successful: Unsuccessful:

avatar pe7er
pe7er
7 May 2016

Fixed the merge conflict for Pull Request #8318

avatar pe7er pe7er - open - 7 May 2016
avatar pe7er pe7er - change - 7 May 2016
Status New Pending
avatar joomla-cms-bot joomla-cms-bot - change - 7 May 2016
Labels Added: ?
avatar brianteeman brianteeman - change - 7 May 2016
Status Pending Ready to Commit
avatar brianteeman
brianteeman - comment - 7 May 2016

Setting to RTC as this is just a merge conflict fix


This comment was created with the J!Tracker Application at issues.joomla.org/joomla-cms/10272.

avatar joomla-cms-bot joomla-cms-bot - change - 7 May 2016
Labels Added: ?
avatar brianteeman brianteeman - change - 7 May 2016
Milestone Added:
avatar Kubik-Rubik
Kubik-Rubik - comment - 7 May 2016

Thank you @pe7er! And I hope you didn't cheat but used the build process... ;-)

avatar Kubik-Rubik Kubik-Rubik - reference | 3188317 - 7 May 16
avatar Kubik-Rubik Kubik-Rubik - merge - 7 May 2016
avatar Kubik-Rubik Kubik-Rubik - close - 7 May 2016
avatar Kubik-Rubik Kubik-Rubik - change - 7 May 2016
Status Ready to Commit Fixed in Code Base
Closed_Date 0000-00-00 00:00:00 2016-05-07 13:44:54
Closed_By Kubik-Rubik
avatar Kubik-Rubik Kubik-Rubik - close - 7 May 2016
avatar Kubik-Rubik Kubik-Rubik - merge - 7 May 2016
avatar joomla-cms-bot joomla-cms-bot - close - 7 May 2016
avatar joomla-cms-bot joomla-cms-bot - change - 7 May 2016
Labels Removed: ?
avatar pe7er
pe7er - comment - 7 May 2016

Nope, I was thinking about adding it manually,
but I didn't dare to do it with you all in the room looking at me :-)
Instead I've used: php build/generatecss.php

Add a Comment

Login with GitHub to post a comment