From 5ce238d69b9cd6b17eb4d28c62cee044076d636f Mon Sep 17 00:00:00 2001
From: Bob <1397910458@qq.com>
Date: Fri, 18 Sep 2020 14:46:01 +0800
Subject: [PATCH] Merge branch 'master' of
 http://210.77.77.77/xieshen/newmediamonitoring

# Conflicts:
#	NewMediaMonitoring/urls.py
---
 .gitignore | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/.gitignore b/.gitignore
index 224dbd3..57e00bd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,7 +1,6 @@
-.idea/
-.venv/
-.media/
-*/__pycache__/
-*/*.pyc
-*/migrations
-NewMediaMonitoring/local_settings.py
\ No newline at end of file
+.idea/
+.venv/
+.media/
+*/__pycache__/
+*/migrations
+NewMediaMonitoring/local_settings.py