Closed moti-malka closed 6 years ago
On Fri, Feb 9, 2018, 7:27 AM aayaffe notifications@github.com wrote:
- There are merge conflicts.
- It seems that you added no new functionality.
- You keep changing this file: .idea/misc.xml to use absolute path for files.
— You are receiving this because you authored the thread. Reply to this email directly, view it on GitHub https://github.com/AviMarineInnovatons/BoatAngels/pull/69#issuecomment-364338953, or mute the thread https://github.com/notifications/unsubscribe-auth/AaqFoBYaHQ4lBbZmTty75n1FE41h9a6Lks5tS9cugaJpZM4R_Fqp .
Look at the files changed. No change seems to add the functionality you described.