Local Update

mcicoria · Aug 10, 2012 · 5dac239 · 5dac239
1 parent 876f510
commit 5dac239
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/views/index.mu b/views/index.mu
@@ -43,6 +43,10 @@
   </head>
 
   <body>
+<<<<<<< HEAD
+=======
+  <div id="fb-root"></div>
+>>>>>>> Local Update
 <div id="fb-root"></div>
 <script>(function(d, s, id) {
   var js, fjs = d.getElementsByTagName(s)[0];