Commit b769d828 authored by Pat Kira's avatar Pat Kira Committed by Aaron Wells

FIX conflict resolution (bootstrap)

Bug 1465107: Use Bootstrap CSS Framework

Change-Id: I800ce2a6ffa78ee406e52631882c9d7a5603f1ed
parent 17361373
......@@ -27,3 +27,4 @@ mahara-*.zip
/debian/mahara-apache2
.DS_Store
/external
logfile
\ No newline at end of file
......@@ -185,14 +185,11 @@ jQuery(function($) {
}
}
if (data.message.message) {
<<<<<<< HEAD
var warningClass = data.message.messagestatus === 'ok' ? 'success' : 'warning';
var warnmessage = $('<div id="changestatusline" class="alert alert-dismissible alert-' + warningClass + '" role="alert"><button type="button" class="close" data-dismiss="alert" aria-label="Close"><span aria-hidden="true">&times;</span></button><p>' + data.message.message + '</p></div>');
=======
var warnmessage = $('<div id="changestatusline" class="' + data.message.messagestatus + '"><div>' + data.message.message + '</div></div>');
>>>>>>> 8d8cc48... FIX: To allow the use jQuery within function(s) (bootstrap)
$('#messages').empty().append(warnmessage);
}
wiresortables();
......
LOG: database system was shut down at 2015-05-28 22:28:12 NZST
LOG: autovacuum launcher started
LOG: database system is ready to accept connections
LOG: could not open temporary statistics file "pg_stat_tmp/global.tmp": No space left on device
LOG: could not open temporary statistics file "pg_stat_tmp/global.tmp": No space left on device
LOG: could not open temporary statistics file "pg_stat_tmp/global.tmp": No space left on device
LOG: could not open temporary statistics file "pg_stat_tmp/global.tmp": No space left on device
LOG: could not open temporary statistics file "pg_stat_tmp/global.tmp": No space left on device
LOG: could not open temporary statistics file "pg_stat_tmp/global.tmp": No space left on device
LOG: could not open temporary statistics file "pg_stat_tmp/global.tmp": No space left on device
LOG: could not open temporary statistics file "pg_stat_tmp/global.tmp": No space left on device
LOG: could not open temporary statistics file "pg_stat_tmp/global.tmp": No space left on device
LOG: could not open temporary statistics file "pg_stat_tmp/global.tmp": No space left on device
LOG: could not open temporary statistics file "pg_stat_tmp/global.tmp": No space left on device
LOG: could not open temporary statistics file "pg_stat_tmp/global.tmp": No space left on device
LOG: could not open temporary statistics file "pg_stat_tmp/global.tmp": No space left on device
LOG: could not open temporary statistics file "pg_stat_tmp/global.tmp": No space left on device
LOG: could not open temporary statistics file "pg_stat_tmp/global.tmp": No space left on device
LOG: could not open temporary statistics file "pg_stat_tmp/global.tmp": No space left on device
LOG: could not open temporary statistics file "pg_stat_tmp/global.tmp": No space left on device
LOG: could not open temporary statistics file "pg_stat_tmp/global.tmp": No space left on device
LOG: could not open temporary statistics file "pg_stat_tmp/global.tmp": No space left on device
LOG: could not open temporary statistics file "pg_stat_tmp/global.tmp": No space left on device
LOG: could not open temporary statistics file "pg_stat_tmp/global.tmp": No space left on device
LOG: could not open temporary statistics file "pg_stat_tmp/global.tmp": No space left on device
LOG: could not open temporary statistics file "pg_stat_tmp/global.tmp": No space left on device
LOG: could not open temporary statistics file "pg_stat_tmp/global.tmp": No space left on device
LOG: could not open temporary statistics file "pg_stat_tmp/global.tmp": No space left on device
LOG: could not open temporary statistics file "pg_stat_tmp/global.tmp": No space left on device
LOG: could not open temporary statistics file "pg_stat_tmp/global.tmp": No space left on device
LOG: could not open temporary statistics file "pg_stat_tmp/global.tmp": No space left on device
LOG: could not open temporary statistics file "pg_stat_tmp/global.tmp": No space left on device
LOG: could not open temporary statistics file "pg_stat_tmp/global.tmp": No space left on device
LOG: could not open temporary statistics file "pg_stat_tmp/global.tmp": No space left on device
LOG: using stale statistics instead of current ones because stats collector is not responding
LOG: could not open temporary statistics file "pg_stat_tmp/global.tmp": No space left on device
LOG: could not open temporary statistics file "pg_stat_tmp/global.tmp": No space left on device
LOG: could not open temporary statistics file "pg_stat_tmp/global.tmp": No space left on device
LOG: could not open temporary statistics file "pg_stat_tmp/global.tmp": No space left on device
LOG: could not open temporary statistics file "pg_stat_tmp/global.tmp": No space left on device
LOG: could not open temporary statistics file "pg_stat_tmp/global.tmp": No space left on device
LOG: could not open temporary statistics file "pg_stat_tmp/global.tmp": No space left on device
LOG: could not open temporary statistics file "pg_stat_tmp/global.tmp": No space left on device
LOG: could not open temporary statistics file "pg_stat_tmp/global.
\ No newline at end of file
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment