Rebuild the kitchen sink.

2012-03-31 12:18:32 +02:00 · 2012-03-31 12:18:32 +02:00 · 539b5fe556
commit 539b5fe556
parent bdb21ff646
2 changed files with 15 additions and 371 deletions
--- a/build/kitchen-sink.html
+++ b/build/kitchen-sink.html
@ -11,11 +11,7 @@
    
    Ace
      version 0.2.0
-<<<<<<< HEAD
      commit  517e88f2f077263e49159c7b1742b5f3a7c605b4
-=======
-      commit  0fb6590f265d338b4aa70430713767b93e540f11
->>>>>>> 9b4f97565d0c02c561a2e275d567d8611b91465f

    
    -->