ng6 merge requestshttps://forgemia.inra.fr/genotoul-bioinfo/ng6/-/merge_requests2019-09-13T09:54:45+02:00https://forgemia.inra.fr/genotoul-bioinfo/ng6/-/merge_requests/41This is a test branch and test commit, to screenshot a merge conflict2019-09-13T09:54:45+02:00Romain ThervilleThis is a test branch and test commit, to screenshot a merge conflictThis is a test branch and test commit, to screenshot a merge conflict and add it to a powerpoint.This is a test branch and test commit, to screenshot a merge conflict and add it to a powerpoint.V3.2.5.3Romain ThervilleRomain Thervillehttps://forgemia.inra.fr/genotoul-bioinfo/ng6/-/merge_requests/73Merge test (isue 126 with master)2019-12-11T14:25:59+01:00Romain ThervilleMerge test (isue 126 with master)This is a test.This is a test.V3.2.7Romain ThervilleRomain Thervillehttps://forgemia.inra.fr/genotoul-bioinfo/ng6/-/merge_requests/42merge branch Issue#130.2 with Issue#1302019-09-13T10:28:47+02:00Romain Thervillemerge branch Issue#130.2 with Issue#130This is a test to screenshot a merge conflictThis is a test to screenshot a merge conflictV3.2.5.3Romain ThervilleRomain Therville