Fixed conflicts between git flow 2.1.1 and non-flow 2.1.1

1 files changed, 6 insertions, 5 deletions

diff --git a/user_guide/installation/downloads.html b/user_guide/installation/downloads.html
index af0079692..12252ad47 100644
--- a/user_guide/installation/downloads.html
+++ b/user_guide/installation/downloads.html
@@ -92,11 +92,12 @@ Downloading CodeIgniter
 <h1 id="git">Git Server</h1>
 <p><a href="http://git-scm.com/about">Git</a> is a distributed version control system.</p>
 
-							<p>Public Git access is available at <a href="https://github.com/EllisLab/CodeIgniter">GitHub</a>.
-								Please note that while every effort is made to keep this code base functional, we cannot guarantee the functionality of code taken
-								from the tip.</p>
+<p>Public Git access is available at <a href="https://github.com/EllisLab/CodeIgniter">GitHub</a>.
+	Please note that while every effort is made to keep this code base functional, we cannot guarantee the functionality of code taken
+	from the tip.</p>
+
+<p>Beginning with version 2.0.3, stable tags are also available via GitHub, simply select the version from the Tags dropdown.</p>
 
-							<p>Beginning with version 2.0.3, stable tags are also available via GitHub, simply select the version from the Tags dropdown.</p>
 </div>
 <!-- END CONTENT -->
 
@@ -109,7 +110,7 @@ Previous Topic:&nbsp;&nbsp;<a href="../general/credits.html">Credits</a>
 <a href="../index.html">User Guide Home</a>&nbsp;&nbsp;&nbsp;&middot;&nbsp;&nbsp;
 Next Topic:&nbsp;&nbsp;<a href="../installation/index.html">Installation Instructions</a>
 </p>
-<p><a href="http://codeigniter.com">CodeIgniter</a> &nbsp;&middot;&nbsp; Copyright &#169; 2006 - 2011 &nbsp;&middot;&nbsp; <a href="http://ellislab.com/">EllisLab, Inc.</a></p>
+<p><a href="http://codeigniter.com/">CodeIgniter</a> &nbsp;&middot;&nbsp; Copyright &#169; 2006 - 2012 &nbsp;&middot;&nbsp; <a href="http://ellislab.com/">EllisLab, Inc.</a></p>
 </div>
 
 </body>