more fixes to pvector tutorial

shiffman · shiffman · commit 32e10ff369ff · 2010-01-12T19:51:00.000Z
diff --git a/content/static/tutorials/pvector/index.html b/content/static/tutorials/pvector/index.html
@@ -537,16 +537,6 @@ <h5>Vectors:  Magnitude</h5>
 
 <h5>Vectors:  Normalizing</h5>
 
-<<<<<<< .mine
-Calculating the magnitude of a vector is only the beginning.  The magnitude function opens the door to many possibilities, the first of which is normalization.  Normalizing refers to the process of making something �standard� or, well, �normal.�  In the case of vectors, let�s assume for the moment that a standard vector has a length of one.  To normalize a vector, therefore, is to take a vector of any length and, keeping it pointing in the same direction, change its length to one, turning it into what is referred to as a unit vector.
-<br /><br />
-Being able to quickly access the unit vector is useful since it describes a vector�s direction without regard to length, and we�ll see this come in handy once we start to work with forces in Chapter 2. 
-<br /><br />
-For any given vector  , its unit vector (written as �) is calculated as follows:
-
-	<li>� =  / ||||
-
-=======
 Calculating the magnitude of a vector is only the beginning.  The magnitude function opens the door to many possibilities, the first of which is <strong><em>normalization</em></strong>.  Normalizing refers to the process of making something "standard" or, well, "normal."  In the case of vectors, let's assume for the moment that a standard vector has a length of one.  To normalize a vector, therefore, is to take a vector of any length and, keeping it pointing in the same direction, change its length to one, turning it into what is referred to as a <strong><em>unit vector</em></strong>.
 <br /><br />
 <img src="imgs/normalize1.jpg">
@@ -555,7 +545,6 @@ <h5>Vectors:  Normalizing</h5>
 <br /><br />
 &#251; = <strong>u</strong> / ||<strong>u</strong>||
 <br /><br />
->>>>>>> .r5967
 In other words, to normalize a vector, simply divide each component by its magnitude.  This makes pretty intuitive sense.  Say a vector is of length 5.  Well, 5 divided by 5 is 1.  So looking at our right triangle, we then need to scale the hypotenuse down by dividing by 5.   And so in that process the sides shrink, dividing by 5 as well.
 <br /><br />
 <img src="imgs/normalize2.jpg">
