1 files changed, 4 insertions, 0 deletions

diff --git a/doc/book-enea-nfv-access-open-source/doc/licenses.xml b/doc/book-enea-nfv-access-open-source/doc/licenses.xml
index 98da05d..7d5521c 100644
--- a/doc/book-enea-nfv-access-open-source/doc/licenses.xml
+++ b/doc/book-enea-nfv-access-open-source/doc/licenses.xml
@@ -1175,7 +1175,11 @@ specific documentation.-->
  <entry>libgcc-initial</entry>
  <entry>7.3.0</entry>
  <entry>GNU cc and gcc C compilers.</entry>
+<<<<<<< HEAD
  <entry> GPL-3.0-with-GCC-exception, GPL-3.0</entry>
+=======
+ <entry>GPL-3.0-with-GCC-exception</entry>
+>>>>>>> Updated licenses.xml
 </row>
 <row>
  <entry>libgcc</entry>