Permalink
Browse files

Fix invalid merge caused by commit c4aab4

  • Loading branch information...
1 parent dfc1b63 commit c8621656849896ec2d7d247603958b9cfedceb81 @epienbroek committed Aug 21, 2012
Showing with 1 addition and 1 deletion.
  1. +1 −0 ui/mailbox-properties-dialog.ui
  2. +0 −1 ui/properties-dialog.ui
@@ -30,6 +30,7 @@
<object class="GtkVBox" id="vbox2">
<property name="visible">True</property>
<property name="spacing">6</property>
+ <property name="expand">False</property>
<child>
<object class="GtkLabel" id="label2">
<property name="visible">True</property>
@@ -398,7 +398,6 @@
<object class="GtkVBox" id="vbox2">
<property name="visible">True</property>
<property name="spacing">6</property>
- <property name="expand">False</property>
<child>
<object class="GtkRadioButton" id="popups_position_attached_radio">
<property name="visible">True</property>

0 comments on commit c862165

Please sign in to comment.