Fixed merge errors

bob/pad/face/config/database/replay_mobile.py

@@ -20,11 +20,7 @@ from bob.pad.face.database import ReplayMobilePadDatabase
 
 # Directory where the data files are stored.
 # This directory is given in the .bob_bio_databases.txt file located in your home directory
-<<<<<<< HEAD:bob/pad/face/config/database/replay_mobile.py
 original_directory = "[YOUR_REPLAY_MOBILE_DIRECTORY]"
-=======
-original_directory = "[YOUR_MIFS_DATABASE_DIRECTORY]"
->>>>>>> Added face bounding boxes to tree and cleaned database path:bob/pad/face/config/database/mifs.py
 """Value of ``~/.bob_bio_databases.txt`` for this database"""
 
 original_extension = ".mov" # extension of the data files
@@ -49,4 +45,4 @@ Notice that ``original_directory`` is set to ``[YOUR_REPLAY_MOBILE_DIRECTORY]``.
 You must make sure to create ``${HOME}/.bob_bio_databases.txt`` setting this
 value to the place where you actually installed the Replay-Mobile Database, as
 explained in the section :ref:`bob.pad.face.baselines`.
-"""
\ No newline at end of file
+"""

bob/pad/face/config/replay_attack.py

@@ -16,11 +16,7 @@ from bob.pad.face.database import ReplayPadDatabase
 
 # Directory where the data files are stored.
 # This directory is given in the .bob_bio_databases.txt file located in your home directory
-<<<<<<< HEAD:bob/pad/face/config/replay_attack.py
 ORIGINAL_DIRECTORY = "[YOUR_REPLAY_ATTACK_DIRECTORY]"
-=======
-ORIGINAL_DIRECTORY = "[YOUR_MIFS_DATABASE_DIRECTORY]"
->>>>>>> Added face bounding boxes to tree and cleaned database path:bob/pad/face/config/mifs.py
 """Value of ``~/.bob_bio_databases.txt`` for this database"""
 
 ORIGINAL_EXTENSION = ".mov" # extension of the data files

bob/pad/face/test/test_databases.py

@@ -57,7 +57,6 @@ def test_msu_mfsd():
     except IOError as e:
         raise SkipTest(
             "The database could not be queried; probably the db.sql3 file is missing. Here is the error: '%s'" % e)
-<<<<<<< HEAD
 
 
 # Test the Aggregated database, which doesn't have a package
@@ -88,12 +87,3 @@ def test_aggregated_db():
     except IOError as e:
         raise SkipTest(
             "The database could not be queried; probably the db.sql3 file is missing. Here is the error: '%s'" % e)
-
-
-
-
-
-
-
-=======
->>>>>>> ed055bf5d9222546143fa212b578be273ace2269