View | Details | Raw Unified | Return to bug 203340
Collapse All | Expand All

(-)C:/Users/walkem4/Documents/RPI/2015 2 Fall/CSCI 2961/Lab 4/handbook/disks/chapter.xml (-2 / +2 lines)
Lines 3600-3601 esac</programlisting> Link Here
3600 
	<para>The administrator must decide which node has more
 3600 
	<para>The administrator must either decide which node has more
3601 
	  important changes or merge them manually.  Then, let
 3601 
	  important changes, or perform the merge manually.  Then, let

Return to bug 203340