X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=_manual%2F07_working-with-sessions%2F01_the-new-session-dialog%2F01_audio-setup.html;h=0f2e145c02940f0ee7c870ec01d6da13170aa10d;hb=2e006d9b931807ddc386650766de3a5fe44a271b;hp=bd0ba992db1f3699bdda2099d49866acb2702e5b;hpb=cbf81a31d207baebf2fe4df62318651831774aaf;p=ardour-manual

diff --git a/_manual/07_working-with-sessions/01_the-new-session-dialog/01_audio-setup.html b/_manual/07_working-with-sessions/01_the-new-session-dialog/01_audio-setup.html
index bd0ba99..0f2e145 100644
--- a/_manual/07_working-with-sessions/01_the-new-session-dialog/01_audio-setup.html
+++ b/_manual/07_working-with-sessions/01_the-new-session-dialog/01_audio-setup.html
@@ -31,14 +31,6 @@ title: Audio Setup
   </dd>
 
   <dt>Interface</dt>
-  <dd>
-<<<<<<< HEAD:_manual/07_working-with-sessions/01_the-new-session-dialog/01_audio-setup.html
-    The selector should show all the supported interfaces that the are duplex capable (i.e. support input and output to and from Ardour). <strong>Important</strong> if you are using an Intel Mac running
-    OS X and the built-in audio interface, you must
-    first <a href="/setting-up-your-system/using_more_than_one_audio_device">merge
-      its separate input and output devices into a single "aggregate
-      device"</a> before Ardour will be able to use it.
-=======
   <dd>The selector should show all availiable interfaces that driver
       provides that are duplex capable for Ardour to
       use. <strong>Important</strong> if you are using an Intel Mac
@@ -46,8 +38,7 @@ title: Audio Setup
       first <a href="setting-up-your-system/us
       ing_more_than_one_audio_device/">merge its separate input and
       output devices into a single "aggregate device"</a> before
-      Ardour will be able to use it.<br>
->>>>>>> minor patch for manual section on using multiple devices (from Thomas Vecchione):_manual/07_working-with-sessions/06_the-new-session-dialog/01_audio-setup.html
+      Ardour will be able to use it.
   </dd>
 
   <dt>Sample Rate</dt>