rebase master
diff --git a/source/locale/fr/LC_MESSAGES/networking/public_ips_and_vlans_for_accounts.po b/source/locale/fr/LC_MESSAGES/networking/public_ips_and_vlans_for_accounts.po
index 10ee6c2..4eb8e76 100644
--- a/source/locale/fr/LC_MESSAGES/networking/public_ips_and_vlans_for_accounts.po
+++ b/source/locale/fr/LC_MESSAGES/networking/public_ips_and_vlans_for_accounts.po
@@ -21,16 +21,25 @@
"Project-Id-Version: Apache CloudStack Administration RTD\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2014-06-30 12:52+0200\n"
+<<<<<<< HEAD
"PO-Revision-Date: 2017-07-19 11:56+0200\n"
+=======
+"PO-Revision-Date: 2017-08-07 21:45+0200\n"
+>>>>>>> 2413ecb688e4947d38e67620eb886be3bdeed09a
"Language-Team: French (http://www.transifex.com/ke4qqq/apache-cloudstack-"
"administration-rtd/language/fr/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"Last-Translator: Antoine Le Morvan <antoine@le-morvan.com>\n"
"Language: fr\n"
+<<<<<<< HEAD
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
"Last-Translator: \n"
"X-Generator: Poedit 2.0.2\n"
+=======
+"X-Generator: Poedit 2.0.3\n"
+>>>>>>> 2413ecb688e4947d38e67620eb886be3bdeed09a
# e16ce84ab27a470389c600bd7f1937e6
#: ../../networking/public_ips_and_vlans_for_accounts.rst:18
