From d8936f05edcc8b428b5c489a7631ba07086fb9c0 Mon Sep 17 00:00:00 2001
From: gloas <gloas@git-test.afi-sa.fr>
Date: Wed, 23 Oct 2013 09:05:57 +0000
Subject: [PATCH] Class users : rajout des constants
---
library/Class/Users.php | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/library/Class/Users.php b/library/Class/Users.php
index d04cc16ef1a..5363bd588f3 100644
--- a/library/Class/Users.php
+++ b/library/Class/Users.php
@@ -180,12 +180,10 @@ class Class_Users extends Storm_Model_Abstract {
const MODE_CONTACT_MAIL = 'is_contact_mail';
const MODE_CONTACT_LETTER = 'is_contact_letter';
const MODE_CONTACT_SMS = 'is_contact_sms';
-<<<<<<< Updated upstream
-=======
const CIVILITE_INDEFINIE = 0;
const CIVILITE_MADAME = 1;
const CIVILITE_MONSIEUR = 2;
->>>>>>> Stashed changes
+
protected $_table_name = 'bib_admin_users';
protected $_table_primary = 'ID_USER';
--
GitLab