diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md index d32d7fb..b78e737 100644 --- a/CODE_OF_CONDUCT.md +++ b/CODE_OF_CONDUCT.md @@ -43,4 +43,8 @@ Project maintainers who do not follow or enforce the Code of Conduct in good fai This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4, available at [http://contributor-covenant.org/version/1/4][version] [homepage]: http://contributor-covenant.org +<<<<<<< HEAD [version]: http://contributor-covenant.org/version/1/4/ +======= +[version]: http://contributor-covenant.org/version/1/4/ +>>>>>>> c51a062... * docs(CODE_OF_CONDUCT): added diff --git a/examples/basic.html b/examples/basic.html index dc5137a..777c007 100644 --- a/examples/basic.html +++ b/examples/basic.html @@ -13,37 +13,37 @@ text-align: center; line-height: 5em; } -.box { - width: 50px; - height: 50px; - background: #fc0; -}
- - +