[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    kdereview/metabar/src
From:       Florian Roth <florian () synatic ! net>
Date:       2005-07-14 15:01:03
Message-ID: 1121353263.831685.7083.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 434560 by roth:

Remove error


 M  +1 -5      layout.html  


--- trunk/kdereview/metabar/src/layout.html #434559:434560
@@ -13,11 +13,7 @@
 </div>
 
 <div class="frame">
-<<<<<<< .mine
-  <div class="head"><a i18n image="run" class="title" onClick="this.blur();"  \
                href="function://toggle/open">Open with</a></div>
-=======
-  <a i18n image="run" class="title" onClick="this.blur();"  \
                href="function://toggle/open">Open With</a>  
->>>>>>> .r434547
+  <div class="head"><a i18n image="run" class="title" onClick="this.blur();"  \
href="function://toggle/open">Open With</a></div>  <li id="open" expanded="true" \
style="height:0px">  </li>
 </div>


[prev in list] [next in list] [prev in thread] [next in thread]