Commit be42b3e3 authored by Areum Kim's avatar Areum Kim
Browse files

[Issue, #36] update for merge conflicts

parent dc5e64d0
Pipeline #77155 passed with stages
in 2 minutes and 1 second
......@@ -163,7 +163,6 @@ fun Application.module() {
allFiles.add(AllFiles(faqData.name, faqData.id.toString(), faqData.status))
}
}
call.respond(allFiles)
}
......@@ -171,7 +170,6 @@ fun Application.module() {
routing{
}
}
// registerUploadRoutes()
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment