mirror of
https://github.com/naturalcrit/homebrewery.git
synced 2026-09-27 17:42:58 +00:00
Fixed
This commit is contained in:
@@ -194,7 +194,6 @@ export default async function createApp(vite) {
|
||||
}
|
||||
});
|
||||
|
||||
<<<<<<< HEAD
|
||||
//Edit Page
|
||||
app.get('/edit/:id', asyncHandler(getBrew('edit')), asyncHandler(async(req, res, next)=>{
|
||||
req.brew = req.brew.toObject ? req.brew.toObject() : req.brew;
|
||||
@@ -329,7 +328,6 @@ export default async function createApp(vite) {
|
||||
|
||||
return next();
|
||||
}));
|
||||
=======
|
||||
// Create Event Stream source for pages to listen to
|
||||
app.get('/stream', (req, res)=>{
|
||||
res.writeHead(200, {
|
||||
@@ -350,7 +348,6 @@ export default async function createApp(vite) {
|
||||
Stream.emit('sendUpdate', 'initStream', { time: new Date });
|
||||
}, 1000);
|
||||
|
||||
>>>>>>> master
|
||||
|
||||
// Local only
|
||||
if(isLocalEnvironment){
|
||||
|
||||
Reference in New Issue
Block a user