From 0e2016cd558410cc60510b84ce946d8d2b233123 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20Geissb=C3=BChler?= <david.geissbuhler@idiap.ch>
Date: Thu, 28 Sep 2017 14:38:53 +0200
Subject: [PATCH] Fixed merge errors
---
bob/pad/face/config/database/replay_mobile.py | 6 +-----
bob/pad/face/config/replay_attack.py | 4 ----
bob/pad/face/test/test_databases.py | 10 ----------
3 files changed, 1 insertion(+), 19 deletions(-)
diff --git a/bob/pad/face/config/database/replay_mobile.py b/bob/pad/face/config/database/replay_mobile.py
index aa14abfb..9f1ae949 100644
--- a/bob/pad/face/config/database/replay_mobile.py
+++ b/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
+"""
diff --git a/bob/pad/face/config/replay_attack.py b/bob/pad/face/config/replay_attack.py
index d7e4b259..0efc24be 100644
--- a/bob/pad/face/config/replay_attack.py
+++ b/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
diff --git a/bob/pad/face/test/test_databases.py b/bob/pad/face/test/test_databases.py
index 6df4e4ac..22fc3ca0 100644
--- a/bob/pad/face/test/test_databases.py
+++ b/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
--
GitLab