change: resolve merge conflicts

This commit is contained in:
thinwybk 2017-01-10 19:52:09 +01:00 committed by GitHub
parent 01aabaad17
commit 86e2da0dfa

View File

@ -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). Inspired by [awesome-php](https://github.com/ziadoz/awesome-php).
- [Awesome Python](#awesome-python) - [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) - [Build Tools](#build-tools)
- [Caching](#caching) - [Caching](#caching)
- [ChatOps Tools](#chatops-tools) - [ChatOps Tools](#chatops-tools)