Le 19/01/2016 16:49, Stephan Witt a écrit :
Am 19.01.2016 um 22:40 schrieb Uwe Stöhr <uwesto...@lyx.org>:commit 360992cb9ff36f882e47036b6f6b1a5e3fe4efd7 Author: Uwe Stöhr <uwesto...@lyx.org> Date: Tue Jan 19 22:40:38 2016 +0100 Revert "Fix the display of column spacing in AMS environments" This reverts commit bb5470b5d1ec1b2f7394164686d6035a0c4bce0f. I have no clue what is with my GIT. I apologize. Can anybody please check if it is now OK again?I don’t think so. You had a merge conflict in change f1a388584fb2c043d17127d7db49c36cb8427cfa. Sorry, I cannot help right now.
It seems you have correctly put everything back in order. git diff e5936b49 764a2163 shows no change for me. Please, someone double check.
Guillaume
