修复合并后的冲突

This commit is contained in:
sxw
2015-08-08 12:28:29 +08:00
parent 31bb8590ad
commit 31b9367a87

View File

@@ -11,4 +11,4 @@ class AdminTemplateView(APIView):
try:
return HttpResponse(open(path).read(), content_type="text/html")
except IOError:
raise Http404
raise HttpResponse(u"模板不存在", content_type="text/html")