Committer: afedorov
Fix conflictU branches/r93.3/cgi-bin/LJ/Hooks/Homepage.pm
Modified: branches/r93.3/cgi-bin/LJ/Hooks/Homepage.pm =================================================================== --- branches/r93.3/cgi-bin/LJ/Hooks/Homepage.pm 2012-06-25 15:33:13 UTC (rev 12174) +++ branches/r93.3/cgi-bin/LJ/Hooks/Homepage.pm 2012-06-25 16:01:05 UTC (rev 12175) @@ -113,15 +113,12 @@ LJ::need_res("stc/reskining/2012/june/megafon/euro.css"); } -<<<<<<< .working -======= # beeline # 00.00 28 of June till 23.59 19 0f July if (LJ::_is_branding_active() && ($time > 1340827200 && $time < 1342727940)) { LJ::need_res("stc/reskining/2012/july/beeline/beeline.css"); } ->>>>>>> .merge-right.r12155 ## ## experimental ServicePageReskinning part ##