1 files changed, 2 insertions, 24 deletions

diff --git a/manual/getting_started/ipod_install.tex b/manual/getting_started/ipod_install.tex
index 4158d155ca..43fe580b18 100755
--- a/manual/getting_started/ipod_install.tex
+++ b/manual/getting_started/ipod_install.tex
@@ -134,39 +134,17 @@ you wish. Note that these files should be saved onto your computer's hard disk,
  
   \item Install the bootloader.
     Windows users should now type:
-<<<<<<< ipod_install.tex
-      \begin{code}
-        \opt{ipodvideo}{ipodpatcher [device] -a bootloader-ipodvideo.ipod}%
-        \opt{ipodnano}{ipodpatcher [device] -a bootloader-ipodnano.ipod}%
-        \opt{ipodmini}{ipodpatcher [device] -a bootloader-ipodmini1g.ipod}%
-        \opt{ipodcolor}{ipodpatcher [device] -a bootloader-ipodcolor.ipod}%
-        \opt{ipod4g}{ipodpatcher [device] -a bootloader-ipod4g.ipod}%
-        \opt{ipod3g}{ipodpatcher [device] -a bootloader-ipod3g.ipod}%
-      \end{code}
-    
-=======
     \begin{code}
     ipodpatcher [device] -a \bootloaderfile
     \end{code}
     %
->>>>>>> 1.27
+
     and Mac OS X/Unix users should type:
-<<<<<<< ipod_install.tex
-      \begin{code}
-        \opt{ipodvideo}{./ipodpatcher [device] -a bootloader-ipodvideo.ipod}%
-        \opt{ipodnano}{./ipodpatcher [device] -a bootloader-ipodnano.ipod}% 
-        \opt{ipodmini}{./ipodpatcher [device] -a bootloader-ipodmini1g.ipod}% 
-        \opt{ipodcolor}{./ipodpatcher [device] -a bootloader-ipodcolor.ipod}%
-        \opt{ipod4g}{./ipodpatcher [device] -a bootloader-ipod4g.ipod}%
-        \opt{ipod3g}{./ipodpatcher [device] -a bootloader-ipod3g.ipod}%
-      \end{code}
-    
-=======
+
     \begin{code}
     ./ipodpatcher [device] -a \bootloaderfile
     \end{code}
 
->>>>>>> 1.27
   Replace [device] with the number (Windows users) or device name (Mac OS X/Unix 
   users) you've been using to access your ipod.