pferraro/jboss-as — comment on commit 1e615a16c97ab696e22d4db1fc4c092ae955503b
File: clustering/infinispan/src/main/resources/org/jboss/as/clustering/infinispan/subsystem/LocalDescriptions.properties line 15
By bstansberry:

This file has merge conflicts