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

# Conflicts:
#	NewMediaMonitoring/urls.py
---
 .gitignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitignore b/.gitignore
index 57e00bd..b32a787 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,5 +2,6 @@
 .venv/
 .media/
 */__pycache__/
+*/*.pyc
 */migrations
 NewMediaMonitoring/local_settings.py