忘记保存
This commit is contained in:
parent
8c3cbb16a7
commit
1c4f2e63b1
@ -20,11 +20,7 @@ module.exports = {
|
||||
|
||||
// Various Dev Server settings
|
||||
// host: '192.168.43.94', // can be overwritten by process.env.HOST
|
||||
<<<<<<< HEAD
|
||||
host: IP, // can be overwritten by process.env.HOST
|
||||
=======
|
||||
//host: '192.168.43.94', // can be overwritten by process.env.HOST
|
||||
>>>>>>> 963d9e51332d845e8277defde878642dd553bf1b
|
||||
port: 8001, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined
|
||||
autoOpenBrowser: true,
|
||||
errorOverlay: true,
|
||||
|
||||
@ -174,10 +174,7 @@ export default {
|
||||
loading: false,
|
||||
auth: [],
|
||||
recordType: 0,
|
||||
<<<<<<< HEAD
|
||||
clientHeight: 0
|
||||
=======
|
||||
>>>>>>> 963d9e51332d845e8277defde878642dd553bf1b
|
||||
}
|
||||
},
|
||||
components: {
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user