Remove merge conflict 75/17775/3
authorRonan Le Martret <ronan@fridu.net>
Mon, 10 Mar 2014 15:27:02 +0000 (16:27 +0100)
committerSabera Djelti (sdi2) <sabera.djelti@open.eurogiciel.org>
Mon, 24 Mar 2014 13:38:47 +0000 (14:38 +0100)
commit9f0d04b0cf5e56af7d5c06caaf06adb15151d73b
tree17e45255791c347411ffa0222c93f0d39764045d
parent7c4c0ba619f9c97321fe027f12e94f0989b8d5c1
Remove merge conflict

Change-Id: I2be479e41da03e5cbac2fd5f6ccc95b640564289
Signed-off-by: Ronan Le Martret <ronan@fridu.net>
packaging/email-service.spec