solve confict

ZTL-UwU · ZTL-UwU · commit 41c445c3c01f · 2020-08-14T13:38:43.000+08:00
Signed-off-by: zhangtianli2006 &lt;zhangtianli2006@163.com&gt;
diff --git a/problem/views.py b/problem/views.py
@@ -17,7 +17,6 @@
     TagSerializer,
 )
 from segmentoj.decorator import (
-    syllable_required,
     parameter_required,
 )
 from status.models import Status

Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,6 @@`
`17`	`17`	`TagSerializer,`
`18`	`18`	`)`
`19`	`19`	`from segmentoj.decorator import (`
`20`		`- syllable_required,`
`21`	`20`	`parameter_required,`
`22`	`21`	`)`
`23`	`22`	`from status.models import Status`