Merge branch 'master' of github.com:gelosie/git-flow-cheatsheet

Conflicts: index.zh_CN.html
danielkummer · Mar 14, 2013 · b4bcdff · b4bcdff
2 parents c7c6c3b + 4e5eec3
commit b4bcdff
Showing 1 changed file with 17 additions and 0 deletions.
diff --git a/index.zh_CN.html b/index.zh_CN.html
@@ -9,6 +9,11 @@
     <link rel="stylesheet" href="css/style.css" type="text/css" media="screen,print">
 
     <script src="js/jquery-1.7.2.min.js"></script>
+<<<<<<< HEAD
+=======
+<!--
+
+>>>>>>> 4e5eec3d2b45990c9662239372e8806d3d0866b8
     <script type="text/javascript">
         var _gaq = _gaq || [];
         _gaq.push(['_setAccount', 'UA-33766650-1']);
@@ -23,6 +28,10 @@
             s.parentNode.insertBefore(ga, s);
         })();
     </script>
+<<<<<<< HEAD
+=======
+-->
+>>>>>>> 4e5eec3d2b45990c9662239372e8806d3d0866b8
 </head>
 <body>
 <div id="banner"><a href="">Fork me on GitHub</a></div>
@@ -327,6 +336,10 @@ <h2><a name="comments" href="#comments">Comments</a></h2>
         <div id="disqus_thread"></div>
     </div>
 </footer>
+<<<<<<< HEAD
+=======
+<!--
+>>>>>>> 4e5eec3d2b45990c9662239372e8806d3d0866b8
 <script type="text/javascript">
     /* * * CONFIGURATION VARIABLES: EDIT BEFORE PASTING INTO YOUR WEBPAGE * * */
     var disqus_shortname = 'gitflowcheatsheet'; // required: replace example with your forum shortname
@@ -343,6 +356,10 @@ <h2><a name="comments" href="#comments">Comments</a></h2>
 <noscript>Please enable JavaScript to view the <a href="http://disqus.com/?ref_noscript">comments powered by Disqus.</a>
 </noscript>
 <a href="http://disqus.com" class="dsq-brlink">comments powered by <span class="logo-disqus">Disqus</span></a>
+<<<<<<< HEAD
+=======
+-->
+>>>>>>> 4e5eec3d2b45990c9662239372e8806d3d0866b8
 
 </body>
 </html>