aeichepdx
commented
9 years ago Please update and merge from master and resubmit. (your downstream changes will also be affected.)
Closed bharmon closed 9 years ago
aeichepdx
commented
9 years ago Please update and merge from master and resubmit. (your downstream changes will also be affected.)
bharmon
commented
9 years ago It seems as though things don't go well when I merge into my local master from a branch I worked on.
Looking at Meld, I don't know how to select the changes I should since they're in the js at the top of index.html. Will you go over it with me today if you have time?
On 27 April 2015 at 16:54, Aaron Eiche notifications@github.com wrote:
Closed #23 https://github.com/PDXostc/media_manager-app/pull/23.
— Reply to this email directly or view it on GitHub https://github.com/PDXostc/media_manager-app/pull/23#event-291450752.
Barbara Harmon Graphics Developer - Infotainment
T: 1.971.256.9733 X1033 Email: bharmon@jaguarlandrover.com fgraham@jaguarlandrover.com
Jaguar Land Rover North America, LLC
Business Details: Jaguar Land Rover Limited Registered Office: Abbey Road, Whitley, Coventry CV3 4LF Registered in England No: 1672070
This e-mail and any attachments contain confidential information for a specific individual and purpose. The information is private and privileged and intended solely for the use of the individual to whom it is addressed. If you are not the intended recipient, please e-mail us immediately. We apologise for any inconvenience caused but you are hereby notified that any disclosure, copying or distribution or the taking of any action in reliance on the information contained herein is strictly prohibited.
This e-mail does not constitute an order for goods or services unless accompanied by an official purchase order.
Modified the songProgress bar height and placement to deal with the issue with the seeking. Cleaned up the CSS a bit.
Signed-off-by: BHarmon bharmon@jaguarlandrover.com
Change-Id: Ib1d0024a3ece3810f84914b7650b9a1e3dc0c59c