Update README.md

xz · May 20, 2020 · 29060bd · 29060bd · vercel · May 20, 2020
1 parent 8dae822
commit 29060bd
Showing 1 changed file with 0 additions and 3 deletions.
diff --git a/README.md b/README.md
@@ -6,11 +6,8 @@ A classless CSS framework to write modern websites using only HTML. It weighs **
 
 Take a look at the demo on [newcss.net](https://newcss.net/), or the quick-start guide on [newcss.net/usage](https://newcss.net/usage/). It's on npm as `@exampledev/new.css`.
 
-<<<<<<< HEAD
 [Vercel](https://vercel.com?utm_source=xz&amp;utm_campaign=new.css)'s impossibly fast CDN delivers the font [Inter](https://rsms.me/inter) using [xz/fonts](https://github.com/xz/fonts), so there's virtually no bloat added to your pages.
 
-=======
->>>>>>> 37fd6fd1db4ef6f909e7360357c780cfce106626
 And of course, there's a dark mode. It automatically applies a light/dark theme based on your browser's preference.
 
 It supports custom color themes and fonts using CSS variables. For example, check out the terminal theme: [newcss.net/theme/terminal/](https://newcss.net/theme/terminal/)