# HG changeset patch
# User Nicholas Jillings <nicholas.jillings@mail.bcu.ac.uk>
# Date 1476809513 -3600
# Node ID 522f58e7773e6c84fc7a883a38b5c60af251a51e
# Parent  d002a342cfaf861b1848b8d4f889ac2a488178f9
Stage

diff -r d002a342cfaf -r 522f58e7773e interfaces/AB.js
--- a/interfaces/AB.js	Tue Oct 18 15:28:24 2016 +0100
+++ b/interfaces/AB.js	Tue Oct 18 17:51:53 2016 +0100
@@ -315,13 +315,8 @@
         this.startPlayback = function () {
             if (this.parent.specification.parent.playOne || specification.playOne) {
                 $('.comparator-button').text('Wait');
-<<<<<<< HEAD
-                $('.comparator-button').attr("disabled","true");
-                $(this.playback).removeAttr("disabled");
-=======
                 $('.comparator-button').attr("disabled", "true");
                 $(this.playback).css("disabled", "false");
->>>>>>> 0425ea2... Formatting of AB. WIP for #37
             } else {
                 $('.comparator-button').text('Listen');
             }