fixed merge conflict in question layout

Gemfile

@@ -11,6 +11,7 @@ gem 'nanoc'
 gem 'pdfkit'
 gem 'sassc'
 gem 'slim'
+gem 'sass'
 
 group :nanoc do
   gem 'guard-nanoc'

Gemfile.lock

@@ -101,6 +101,11 @@ GEM
     rb-inotify (0.10.1)
       ffi (~> 1.0)
     ref (2.0.0)
+    sass (3.7.4)
+      sass-listen (~> 4.0.0)
+    sass-listen (4.0.0)
+      rb-fsevent (~> 0.9, >= 0.9.4)
+      rb-inotify (~> 0.9, >= 0.9.7)
     sassc (2.2.1)
       ffi (~> 1.9)
     shellany (0.0.1)
@@ -133,6 +138,7 @@ DEPENDENCIES
   mini_racer
   nanoc
   pdfkit
+  sass
   sassc
   slim
 

Rules

@@ -7,6 +7,13 @@ compile '/verenigingen/*.md' do
   write ext: 'html'
 end
 
+compile '/quiz/*.md' do
+  filter :kramdown
+  layout '/partials/question.*'
+  layout '/default.*'
+  write ext: 'html'
+end
+
 compile '/homepage.md' do
   filter :kramdown
   layout '/homepage.*'
@@ -21,6 +28,13 @@ compile '/verenigingen.md' do
   write ext: 'html'
 end
 
+compile '/quiz.md' do
+  filter :kramdown
+  layout '/quiz.*'
+  layout '/default.*'
+  write ext: 'html'
+end
+
 compile '/*.md' do
   filter :kramdown
   layout '/default.*'

content/quiz.md

@@ -0,0 +1,5 @@
+---
+titel: Quiz
+navigable: true
+order: 3
+---

layouts/partials/question.erb

@@ -16,4 +16,4 @@
         <%= render '/partials/question.*' %>
     })
 </script>
-<%= yield %>
+<%= yield %>

layouts/quiz.erb

@@ -1,5 +1,9 @@
+<h1>Hallo</h1>
 <ul>
-<% @items.find_all("**/questions/*").each do |i| %>
-    <li> <%= link_to(i[:naam], i) %> </li>
+<% @items.find_all("**/quiz/*").each_with_index do |x, i| %>
+    <div id="question<%i%>" class="quistion">
+        <%= render '/partials/question.*', item: x %>
+    </div>
 <% end %>
-<ul>
+</ul>
+<%= yield %>