Skip to content
Snippets Groups Projects
  1. Nov 14, 2018
  2. Nov 13, 2018
  3. Nov 12, 2018
  4. Nov 09, 2018
  5. Nov 08, 2018
  6. Nov 07, 2018
  7. Nov 06, 2018
    • Piotr Gawron's avatar
      Merge branch 'stop-the-madness' into 'master' · dc6a6b4c
      Piotr Gawron authored
      Stop the madness
      
      See merge request !492
      dc6a6b4c
    • Sascha Herzinger's avatar
    • Sascha Herzinger's avatar
      Merge remote-tracking branch 'remotes/origin/master' into stop-the-madness · 8b5ebcb5
      Sascha Herzinger authored
      # Conflicts:
      #	model/src/main/java/lcsb/mapviewer/model/graphics/ArrowType.java
      #	model/src/main/java/lcsb/mapviewer/model/map/MiriamType.java
      #	model/src/main/java/lcsb/mapviewer/model/user/ConfigurationElementTypeGroup.java
      #	model/src/test/java/lcsb/mapviewer/model/AllModelTests.java
      #	model/src/test/java/lcsb/mapviewer/model/log/AllLogTests.java
      #	persist/src/test/java/lcsb/mapviewer/persist/AllDbTests.java
      #	persist/src/test/java/lcsb/mapviewer/persist/dao/AllDaoTests.java
      #	persist/src/test/java/lcsb/mapviewer/persist/dao/log/AllLogTests.java
      #	service/src/main/java/lcsb/mapviewer/services/utils/data/BuildInLayout.java
      #	service/src/main/java/lcsb/mapviewer/services/utils/data/ColorSchemaColumn.java
      #	service/src/test/java/lcsb/mapviewer/services/impl/LayoutServiceTest.java
      #	service/src/test/java/lcsb/mapviewer/services/impl/ProjectServiceTest.java
      
      Comment: Resolved by "Accept Theirs".
      Will fix the comments again via regex rather than manual merging.
      8b5ebcb5
  8. Nov 05, 2018
  9. Nov 02, 2018
Loading