cleaning conflicts in HornetQMom
4d22f2b5f815
Actions

Authored by yifan xing <xing.yif@husky.neu.edu> on Aug 9 2017, 20:29.

Description

cleaning conflicts in HornetQMom

Committed

yifan xing <xing.yif@husky.neu.edu>

Aug 9 2017, 22:43

Pushed

mickmis

Oct 25 2017, 14:31

Parents

R2664:886e6e535cb8: removed some dev code.

Branches

Unknown

Tags

Unknown

yifan xing <xing.yif@husky.neu.edu> committed R2664:4d22f2b5f815: cleaning conflicts in HornetQMom (authored by yifan xing <xing.yif@husky.neu.edu>).Aug 9 2017, 22:43

				Path
	A			apps/meta-app/src/main/scala/net/shrine/metadata/HornetQMom.scala
	A			apps/meta-app/src/main/scala/net/shrine/metadata/RemoteHornetQMom.scala
	P			commons/mom/src/main/scala/net/shrine/mom/HornetQMom.scala Copied to commons/mom/src/main/scala/net/shrine/mom/LocalHornetQMom.scala
	P			commons/mom/src/main/scala/net/shrine/mom/LocalHornetQMom.scala Copied from commons/mom/src/main/scala/net/shrine/mom/HornetQMom.scala