Fixed. On 04/08/2017 08:36, James Procter (Staff) wrote: > On Aug 4, 2017 8:02 AM, "Mungo Carstairs (Staff)" > <[email protected]> wrote: > > My commits at the end of yesterday afternoon are not showing up. > > I had 3 (!) goes at fixing JAL-2500 (exampleFeatures.txt) but > after a pull the latest blame annotation on the second line of > this file is still sitting at 28th July. > I did a bad merge (used git -s ours when I really wanted git -X ours) because one of your commits included utils/eclipse/JalviewCodeStyle.xml and I had already updated it in another branch.
I reapplied your patches with a cherry-pick (commits were still in the log, but simply marked as 'do not apply'). Please check all is OK. > > Also I had a sense that JIRA emails had been slowing down. > nope. they're as slow as normal - but that's a different system anyhow. Jim.
_______________________________________________ Jalview-dev mailing list [email protected] http://www.compbio.dundee.ac.uk/mailman/listinfo/jalview-dev
