From bfc193d8cd9aecdb82d585e8b4e101deac60a5bb Mon Sep 17 00:00:00 2001
From: syuilo <syuilotan@yahoo.co.jp>
Date: Thu, 29 Mar 2018 14:48:47 +0900
Subject: Resolve conflicts

---
 src/server/web/app/auth/views/form.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/server/web/app/auth/views/form.vue')

diff --git a/src/server/web/app/auth/views/form.vue b/src/server/web/app/auth/views/form.vue
index d86ed58b38..9d9e8cdb1b 100644
--- a/src/server/web/app/auth/views/form.vue
+++ b/src/server/web/app/auth/views/form.vue
@@ -7,7 +7,7 @@
 	<div class="app">
 		<section>
 			<h2>{{ app.name }}</h2>
-			<p class="nid">{{ app.name_id }}</p>
+			<p class="nid">{{ app.nameId }}</p>
 			<p class="description">{{ app.description }}</p>
 		</section>
 		<section>
-- 
cgit v1.2.3-freya