Hi William , I resolved the conflicts.

Kindly check.


On Mon, Aug 12, 2013 at 10:37 AM, WilliamBZA <notifications@github.com>wrote:

> In README.md:
>
> > @@ -41,10 +83,10 @@ Events may be sent to all employees or just to specific teams. Below is the sequ
> >
> >  ###Base Notification###
> >  Base notification is the basic notification that will be used to send messages to the employees on the proposed mobile application. This type of notification uses a push technology. That is, it will use an internet-based communication which is initiated by the publisher(or a central server). The proposed attributes for the base notification are:
> > +>>>>>>> upstream/master
>
> Another merge conflict issue
>
> —
> Reply to this email directly or view it on GitHub<https://github.com/BbdCoachlab/Communicator/pull/13/files#r5704782>
> .
>