c4patino/qoverflow
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fixed merge conflict

Browse source
This commit is contained in:
tejusk2 2022-08-18 13:18:56 -05:00
commit 5ce82e4233
1 changed files with 0 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

3
server/routes/question.js
View file

@ -3,10 +3,7 @@ const router = express.Router();
const tokenAuth = require('server/middleware/tokenAuth');
<<<<<<< HEAD
=======
const HandleBounty = require('./question/HandleBounty');
>>>>>>> bounties
const CreateAnswer = require('./question/CreateAnswer');
const CreateAnswerComment = require('./question/CreateAnswerComment');
const CreateComment = require('./question/CreateComment');