smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2026-01-04 20:55:48 +01:00
Code Issues Projects Releases Wiki Activity

[Summary] Removing surprises brought by git.

Browse source
This commit is contained in:
Valeriy Kamyshniy 2014-09-12 17:04:38 +03:00
parent 5340eebadf
commit 48c77b58a0
1 changed files with 0 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

5
gtk2_ardour/ui/tracks_preferences.xml
View file

@ -154,13 +154,8 @@
horzalignment="end"/>
<Dropdown style="generic_button"
id="device_dropdown"
<<<<<<< HEAD
x="97"
y="42"
=======
x="96"
y="40"
>>>>>>> e5c87df6cc4ebef877f5d0e002ce543f2a3f563f
width="126"
height="20"
normalicon="preference_device_dropdown"