This commit is contained in:
gelosie 2013-03-14 14:55:09 +08:00
parent 4c8c67de2e
commit 929ec6e1d2

View File

@ -9,11 +9,6 @@
<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']);
@ -28,10 +23,6 @@
s.parentNode.insertBefore(ga, s);
})();
</script>
<<<<<<< HEAD
=======
-->
>>>>>>> 4e5eec3d2b45990c9662239372e8806d3d0866b8
</head>
<body>
<div id="banner"><a href="">Fork me on GitHub</a></div>
@ -336,10 +327,6 @@
<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
@ -356,10 +343,6 @@
<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>