LBRYCommunity/block-explorer
1
0
Fork 0
Code Issues 31 Pull requests 4 Projects Releases Packages Wiki Activity

fix code merge issues

Browse source
This commit is contained in:
Akinwale Ariwodola 2017-10-09 13:33:39 +01:00
parent e7e444f84a
commit ba995ed51f
1 changed files with 0 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
src/Template/Layout/default.ctp
View file

@ -34,30 +34,6 @@
<!-- End Analytics Code --> <!-- End Analytics Code -->
<?php endif; ?> <?php endif; ?>
<<<<<<< HEAD
=======
<script type="text/javascript">
// handle coinomi and lbry app urls
var hashpart = window.location.hash;
if (hashpart.length > 3) {
hashpart = hashpart.substring(3);
var txhash = null;
if (hashpart.indexOf('?id=') > -1) {
txhash = hashpart.substring(hashpart.indexOf('?id=') + 4);
} else {
var parts = hashpart.split('/');
if (parts.length > 1) {
txhash = parts[1];
}
}
if (txhash && $.trim(txhash.trim).length > 0) {
window.location.href = '/tx/' + txhash;
}
}
</script>
>>>>>>> 04802c3... removed unnecessary alert
<?php echo $this->fetch('meta') ?> <?php echo $this->fetch('meta') ?>
<?php echo $this->fetch('css') ?> <?php echo $this->fetch('css') ?>
<?php echo $this->fetch('script') ?> <?php echo $this->fetch('script') ?>