fix conflicts

ifyouwillit · Jun 10, 2015 · 0a38e94 · 0a38e94
2 parents a97ae2e + dc14d44
commit 0a38e94
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 0 deletions.
diff --git a/index.html b/index.html
@@ -217,6 +217,22 @@ <h1 id="project_title">わぷーアーカイブ</h1>
                   <div class="wapuu-author">Authors: Julio Potier (design)<br>&amp; Christelle Mozzati (vector)</div>
                 </div>
                 <!--Each image end-->                
+                <a href="https://europe.wordcamp.org/2015/">
+                <img src="wapuu-archive/WapuuPepa.png" alt="WapuuPepa">
+                </a>
+                <div class="wapuu-name">なまえ: WapuuPepa</div>
+                <div class="wapuu-author">さくしゃ: Arantza Respaldiza</div>
+                </div>
+                <!--Each image end-->
+                <!--Each image start-->
+                <div class="wapuu-each">
+                <a href="https://europe.wordcamp.org/2015/">
+                <img src="wapuu-archive/WapuuPepe.png" alt="WapuuPepe">
+                </a>
+                <div class="wapuu-name">なまえ: WapuuPepe</div>
+                <div class="wapuu-author">さくしゃ: Arantza Respaldiza</div>
+                </div>
+                <!--Each image end-->
             </section>
         </div>
 

diff --git a/wapuu-archive/WapuuPepa.png b/wapuu-archive/WapuuPepa.png
diff --git a/wapuu-archive/WapuuPepe.png b/wapuu-archive/WapuuPepe.png