Fixing updates.

This commit is contained in:
Gilbert Pellegrom 2013-04-27 15:56:56 +01:00
parent 5ccdf32ff7
commit a8dcd4a5b5
3 changed files with 0 additions and 9 deletions

View file

@ -36,8 +36,6 @@
<script type="text/javascript" src="style/js/jquery.touchcarousel-1.2.min.js"></script>
<script type="text/javascript" src="style/js/twitter.min.js"></script>
<script type="text/javascript" src="style/js/boostrapslider.js"></script>
<<<<<<< HEAD
=======
<script type="text/javascript">
var _gaq = _gaq || [];
_gaq.push(['_setAccount', 'UA-3892196-38']);
@ -48,7 +46,6 @@
var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
})();
</script>
>>>>>>> Updating site.
</head>
<body class="full-layout">
<!-- Begin Body Wrapper -->

View file

@ -36,8 +36,6 @@
<script type="text/javascript" src="style/js/jquery.touchcarousel-1.2.min.js"></script>
<script type="text/javascript" src="style/js/twitter.min.js"></script>
<script type="text/javascript" src="style/js/boostrapslider.js"></script>
<<<<<<< HEAD
=======
<script type="text/javascript">
var _gaq = _gaq || [];
_gaq.push(['_setAccount', 'UA-3892196-38']);
@ -48,7 +46,6 @@
var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
})();
</script>
>>>>>>> Updating site.
</head>
<body class="full-layout">
<!-- Begin Body Wrapper -->

View file

@ -37,8 +37,6 @@
<script type="text/javascript" src="style/js/jquery.touchcarousel-1.2.min.js"></script>
<script type="text/javascript" src="style/js/twitter.min.js"></script>
<script type="text/javascript" src="style/js/boostrapslider.js"></script>
<<<<<<< HEAD
=======
<script type="text/javascript">
var _gaq = _gaq || [];
_gaq.push(['_setAccount', 'UA-3892196-38']);
@ -49,7 +47,6 @@
var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
})();
</script>
>>>>>>> Updating site.
</head>
<body class="full-layout">
<!-- Begin Body Wrapper -->