From 86e2da0dfa2fa9c191b763a77f7cc329685bd62b Mon Sep 17 00:00:00 2001
From: thinwybk <florian.k@mailbox.org>
Date: Tue, 10 Jan 2017 19:52:09 +0100
Subject: [PATCH] change: resolve merge conflicts

---
 README.md | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/README.md b/README.md
index f744160..61166af 100644
--- a/README.md
+++ b/README.md
@@ -5,6 +5,12 @@ A curated list of awesome Python frameworks, libraries, software and resources.
 Inspired by [awesome-php](https://github.com/ziadoz/awesome-php).
 
 - [Awesome Python](#awesome-python)
+    - [Admin Panels](#admin-panels)		
+    - [Algorithms and Design Patterns](#algorithms-and-design-patterns)		
+    - [Anti-spam](#anti-spam)		
+    - [Asset Management](#asset-management)		
+    - [Audio](#audio)		
+    - [Authentication](#authentication)
     - [Build Tools](#build-tools)
     - [Caching](#caching)
     - [ChatOps Tools](#chatops-tools)