Skip to content

Commit a422d8a

Browse files
committed
fix: nuxt config
1 parent 690103e commit a422d8a

File tree

1 file changed

+0
-11
lines changed

1 file changed

+0
-11
lines changed

nuxt.config.ts

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -108,17 +108,6 @@ export default defineNuxtConfig({
108108
maxAgeInSeconds: 60 * 60 * 24,
109109
secureCookieAttribute: true,
110110
httpOnlyCookieAttribute: process.env.NODE_ENV === 'production',
111-
<<<<<<< HEAD
112-
},
113-
session: {
114-
dataType: {
115-
id: 'string',
116-
username: 'string',
117-
iat: 'number',
118-
exp: 'number',
119-
},
120-
=======
121-
>>>>>>> 2cf8e0d (Fix: nuxt auth (#254))
122111
},
123112
session: {
124113
dataType: {

0 commit comments

Comments
 (0)