Fixing the HTML merge errors

WICG / cq-usecases

Use cases and requirements for standardizing element queries.

Other

184 stars 24 forks source link

Closed OrganicPanda closed 9 years ago

OrganicPanda commented 9 years ago

I noticed the HTML had, what looked like, git merge problems so I re-ran the bikeshed process.

curl https://api.csswg.org/bikeshed/ -F file=@index.bs -F force=1 > index.html

I've never used bikeshed before so I'm not sure if that's exactly right but it looks ok.

Hope that helps - keep up the good work!

yoavweiss commented 9 years ago

@wilto - can you take a look?

Wilto commented 9 years ago

Will do.

marcoscaceres commented 9 years ago

LGTM... seems someone merged a merge conflict.

Wilto commented 9 years ago

cough