Branch: refs/heads/issue-1657 Home: https://github.com/RestComm/Restcomm-Connect Commit: a4b22d7072a39d1d44e2ed0eff38c66e5f706fb5 https://github.com/RestComm/Restcomm-Connect/commit/a4b22d7072a39d1d44e2ed0eff38c66e5f706fb5 Author: Maria Farooq <maria-far...@live.com> Date: 2017-03-10 (Fri, 10 Mar 2017)
Changed paths: M restcomm/restcomm.mrb/src/main/java/org/restcomm/connect/mrb/ConferenceMediaResourceControllerGeneric.java M restcomm/restcomm.mrb/src/main/java/org/restcomm/connect/mrb/MediaResourceBrokerGeneric.java M restcomm/restcomm.mrb/src/main/java/org/restcomm/connect/mrb/mock/MockMediaResourceBroker.java M restcomm/restcomm.mrb/src/test/java/org/restcomm/connect/mrb/util/MediaResourceBrokerTestUtil.java Log Message: ----------- resolved merge conflict -- --- You received this message because you are subscribed to the Google Groups "mobicents-commits" group. To unsubscribe from this group and stop receiving emails from it, send an email to mobicents-commits+unsubscr...@googlegroups.com. For more options, visit https://groups.google.com/d/optout.