change: resolve merge conflicts
This commit is contained in:
		@@ -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)
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user