I can see your merge conflict from here

paulirish / css3please

use Autoprefixer instead. <3

http://css3please.com

388 stars 65 forks source link

I can see your merge conflict from here #121

Closed twome closed 11 years ago

twome commented 11 years ago

=======
    2013.04.05: Opera 12.10 supports unprefixed CSS animations, gradients, transforms, and transitions.
    2013.04.05: Removed -webkit-background-clip (thx Albert Scheiner).
>>>>>>>; 84f66852f9ec34abe937da62de0aed75693b1efa

At the bottom of the changelog on the front page, heh.

alrra commented 11 years ago

@twome thanks for letting us know!

@paulirish there is something wrong with the server update as, here, everything looks fine.

paulirish commented 11 years ago

fixed thx