conflicts solved


On Fri, Apr 25, 2014 at 2:05 PM, Menna Tarek
<mennatallah.dawood@gmail.com>wrote:

> I do not need an id ya mansour ana m7taga el session id bs w de gaya fel
> header !!
>
>
> On Thu, Apr 24, 2014 at 10:45 PM, Mansour Said Mansour <
> notifications@github.com> wrote:
>
>> In Entangle/entangle-API/API.txt:
>>
>> > @@ -778,6 +778,24 @@ get the details of an offer
>> >              }
>> >
>> >
>> > +
>> > +## GET /entangle/user/retrieveData
>>
>> this should be /user/{id} for example and walahy ana asef bas fe
>> conflicts tany
>> ana asef walahy tany [image: :cry:]
>>
>> —
>> Reply to this email directly or view it on GitHub<https://github.com/ndomar/megasoft-14/pull/304/files#r11971362>
>> .
>>
>
>