fix conflict

This commit is contained in:
monty 2019-12-09 00:10:35 +01:00
commit 6ef357d16f

View file

@ -102,7 +102,28 @@ module.exports = (client) => {
success: false,
message: 'You are not authorized to access this Endpoint'
});
<<<<<<< HEAD
}
=======
} else {
await exec('git pull')
.then((r) => {
console.log('Pulled latest changes');
res.status(200).jsonp({
success: true,
message: 'Successfully pulled latest changes'
});
trying.edit('```fix\n' + r.stdout + '```');
})
.catch((error) => {
res.status(400).jsonp({
success: false,
message: error.message
});
console.error(error);
});
}
>>>>>>> 5299c2efc2d2e6d7f232b54122bc92a27eacdf19
});
app.listen(port /* , hostname */, () => {