fix conflit

2017-08-21 16:35:15 +06:30
parent 8c6f06a667 f26bc83b42
commit b7f9d56221
20 changed files with 312 additions and 142 deletions
--- a/app/views/origami/commissioners/edit.html.erb
+++ b/app/views/origami/commissioners/edit.html.erb
@@ -0,0 +1,10 @@
+<div class="span12">
+	<div class="page-header">
+	 <ul class="breadcrumb">
+	   	<li><a href="<%= root_path %>">Home</a></li>
+			<li><a href="<%= commissioners_path %>">Commissioners</a></li>
+	  	<li>Edit</li>
+	 </ul>
+	</div>
+    <%= render 'form', commissioner: @commissioner %>
+</div>