# Conflicts:
#   CLEA-lib/java/src/main/java/fr/inria/clea/lsp/LocationContact.java
#   CLEA-lib/java/src/main/java/fr/inria/clea/lsp/LocationContactMessageEncoder.java
#   CLEA-lib/java/src/test/java/fr/inria/clea/lsp/LocationSpecificPartTest.java
#   CLEA-lib/java/src/test/java/fr/inria/clea/lsp/LocationTest.java