From b5aa098c899a74c72653ecab87f6b4375e75e449 Mon Sep 17 00:00:00 2001
From: Avital Oliver <avital@thewe.net>
Date: Tue, 9 Oct 2012 20:25:29 -0700
Subject: [PATCH] Minor fix to an older commit

---
 packages/accounts-password/passwords_tests_setup.js | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/packages/accounts-password/passwords_tests_setup.js b/packages/accounts-password/passwords_tests_setup.js
index d174b47793..19b685a48d 100644
--- a/packages/accounts-password/passwords_tests_setup.js
+++ b/packages/accounts-password/passwords_tests_setup.js
@@ -28,11 +28,7 @@ Accounts.onCreateUser(function (options, extra, user) {
 // For now, we just test the one configuration state. You can comment
 // out each configuration option and see that the tests fail.
 Accounts.config({
-<<<<<<< HEAD
   sendConfirmationEmail: true
-=======
-  validateEmails: true
->>>>>>> accounts: introduce accounts-ui configuration, simplify accounts configuration
 });