Signed-off-by: hmz007 <hmz007@gmail.com> Change-Id: Ib87fdbe7a0be7dc961af3500fe9ea4589a127f9f
4 lines
95 B
Plaintext
4 lines
95 B
Plaintext
# Do not merge `pom.xml` from older version, as it will typically conflict
|
|
|
|
pom.xml merge=ours
|