From 963f558c9353424dab97bbef9d909d6c3b76060a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com>
Date: Fri, 30 Aug 2019 16:03:13 +0800
Subject: [PATCH] Merge branches 'dev_Ysl' and 'dev_aliyun' of
 https://bdgit.educoder.net/Hjqreturn/educoder into dev_Ysl

# Conflicts:
#	public/react/src/modules/courses/Index.js
---
 .../src/modules/courses/groupjobbank/Groupjobquesanswer.js      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/react/src/modules/courses/groupjobbank/Groupjobquesanswer.js b/public/react/src/modules/courses/groupjobbank/Groupjobquesanswer.js
index 374aca841..463b6ecdc 100644
--- a/public/react/src/modules/courses/groupjobbank/Groupjobquesanswer.js
+++ b/public/react/src/modules/courses/groupjobbank/Groupjobquesanswer.js
@@ -10,7 +10,7 @@ import {
 	Tooltip,
 	notification,
 } from "antd";
-import AttachmentsList from '../..'
+// import AttachmentsList from '../..'
 import GroupPackage from './GroupPackage';
 import GroupPackage2 from './GroupPackage2';
 import './questionbanks.css';