From e533aefc1c126ba6fd1ec8ba743ebd54dffa97a5 Mon Sep 17 00:00:00 2001 From: Sindre Sorhus Date: Mon, 18 Jan 2016 13:22:00 +0100 Subject: [PATCH] minor tweaks --- .gitattributes | 1 + readme.md | 8 ++++---- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/.gitattributes b/.gitattributes index 1ee0494..ee4c7f5 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,2 +1,3 @@ * text=auto *.ai binary +readme.md merge=union diff --git a/readme.md b/readme.md index 8ba790a..a985317 100644 --- a/readme.md +++ b/readme.md @@ -8,15 +8,15 @@ > A curated list of awesome lists -[What makes for an awesome list?](awesome.md) - -Please read the [contribution guidelines](contributing.md) or the [creating a list guide](create-list.md) if you want to contribute. +- [What is an awesome list?](awesome.md) +- [Contribution guide](contributing.md) +- [Creating a list](create-list.md) [![Awesome chat](https://badges.gitter.im/sindresorhus/awesome.svg)](https://gitter.im/sindresorhus/awesome) - -**Check out my [blog](https://blog.sindresorhus.com) 🦄 or say *hi* on [Twitter](https://twitter.com/sindresorhus).** +Check out my [blog](https://blog.sindresorhus.com) and follow me on [Twitter](https://twitter.com/sindresorhus). ## Table of Contents