Permalink
Browse files

Merge branch 'develop' of github.com:MapofLife/MOL into develop

Conflicts:
	app/js/mol.map.splash.js
	app/static/js/mol.js
  • Loading branch information...
2 parents b89c046 + ff87421 commit 313aae1917a42a863bc59de1b48390f9ecf42c0d jeremy committed May 10, 2012
Showing with 4 additions and 0 deletions.
  1. +4 −0 app/static/js/mol.js
View
@@ -4502,8 +4502,12 @@ mol.modules.map.splash = function(mol) {
init: function() {
var html = '' +
'<div>' +
+<<<<<<< HEAD
'<div class="message"></div>' +
'<iframe class="mol-splash iframe_content ui-dialog-content" style="height:360px; width: 98%; margin-left: -18px; margin-right: auto; display: block;" src="/static/splash/index.html"></iframe>' +
+=======
+ '<iframe class="mol-splash iframe_content ui-dialog-content" style="height:350px; width: 98%; margin-left: -18px; margin-right: auto; display: block;" src="/static/splash/index.html"></iframe>' +
+>>>>>>> ff87421879a7eb6312758edd56483ab838830642
'<div id="footer_imgs" style="text-align: center">' +
'<div>Our sponsors, partners and supporters</div>' +
'<a target="_blank" href="http://www.yale.edu/jetz/"><button><img width="72px" height="36px" title="Jetz Lab, Yale University" src="/static/home/yale.png"></button></a>' +

0 comments on commit 313aae1

Please sign in to comment.