Solved conflict

effb699f · Luis Salamanca · c9999211 · daec0a8a · c9999211 · effb699f
Commit effb699f authored 6 years ago by Luis Salamanca
--- a/data/politicians/lastnames/2011_lastnames.pickle
+++ b/data/politicians/lastnames/2011_lastnames.pickle
--- a/data/politicians/lastnames/2012_MPs.pickle
+++ b/data/politicians/lastnames/2012_MPs.pickle
--- a/data/politicians/lastnames/2012_lastnames.pickle
+++ b/data/politicians/lastnames/2012_lastnames.pickle
--- a/data/politicians/lastnames/2013_MPs.pickle
+++ b/data/politicians/lastnames/2013_MPs.pickle
--- a/data/politicians/lastnames/2013_lastnames.pickle
+++ b/data/politicians/lastnames/2013_lastnames.pickle
--- a/data/politicians/lastnames/2014_MPs.pickle
+++ b/data/politicians/lastnames/2014_MPs.pickle
--- a/data/politicians/lastnames/2014_lastnames.pickle
+++ b/data/politicians/lastnames/2014_lastnames.pickle
--- a/data/politicians/lastnames/2015_MPs.pickle
+++ b/data/politicians/lastnames/2015_MPs.pickle
--- a/data/politicians/lastnames/2015_lastnames.pickle
+++ b/data/politicians/lastnames/2015_lastnames.pickle
--- a/data/politicians/lastnames/2016_MPs.pickle
+++ b/data/politicians/lastnames/2016_MPs.pickle
--- a/data/politicians/lastnames/2016_lastnames.pickle
+++ b/data/politicians/lastnames/2016_lastnames.pickle
--- a/data/politicians/metadata.yml
+++ b/data/politicians/metadata.yml
--- a/src/python/bla_tryreadxml.py
+++ b/src/python/bla_tryreadxml.py
--- a/src/python/def_classes.py
+++ b/src/python/def_classes.py
--- a/src/python/extractMPs.py
+++ b/src/python/extractMPs.py
--- a/src/python/extract_document_titles.py
+++ b/src/python/extract_document_titles.py
--- a/src/python/run_extract_discussions.py
+++ b/src/python/run_extract_discussions.py
--- a/src/python/utils_annot.py
+++ b/src/python/utils_annot.py
--- a/src/sh/extract_MPs.sh
+++ b/src/sh/extract_MPs.sh
--- a/src/sh/extract_discussions_yearly.sh
+++ b/src/sh/extract_discussions_yearly.sh