On 07/14/2016 02:10 AM, Stephan Witt wrote: > Am 12.07.2016 um 04:17 schrieb LyX Ticket Tracker <t...@lyx.org>: >> #10281: Toolbar icon size discrepancy on multi-monitor setup >> --------------------------+---------------------------- >> Reporter: samsamoa | Owner: skostysh >> Type: defect | Status: fixedinmaster >> Priority: normal | Milestone: 2.2.1 >> Component: frontend-qt5 | Version: 2.2.0 >> Severity: minor | Resolution: >> Keywords: | >> --------------------------+---------------------------- >> >> Comment (by rgheck): >> >> Yes, fine for 2.2.1. > I’m unable to cope with the state of 2.2.x ATM. The line endings > of some windows files are in the way of a "git rebase“. > > Is there any advice how to solve this? > > The modified state of these files is the result of a „git checkout 2.2.x“.
This has been fixed, but it will keep popping up from time to time. Scott found out how to fix it: # git rm .gitattributes # git add -A # git reset --hard Richard
