From 7abdaefd7c463f957fe775cd6060f8bc59881c77 Mon Sep 17 00:00:00 2001 From: "AMP (OpenERP)" Date: Sat, 18 Sep 2010 13:12:09 +0530 Subject: [PATCH] [IMP]hr_*: usability improvement bzr revid: amp@tinyerp.com-20100918074209-uvp80lw0dw4redbs --- addons/hr_evaluation/security/ir.model.access.csv | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/hr_evaluation/security/ir.model.access.csv b/addons/hr_evaluation/security/ir.model.access.csv index d5c554f03f6..9302d265922 100644 --- a/addons/hr_evaluation/security/ir.model.access.csv +++ b/addons/hr_evaluation/security/ir.model.access.csv @@ -32,4 +32,4 @@ "access_survey_answer_hr_user","survey.answer.hr.user","survey.model_survey_answer","base.group_hr_user",1,1,1,0 "access_survey_response_answer_hr_user","survey.response.answer.hr.user","survey.model_survey_response_answer","base.group_hr_user",1,1,1,0 "access_survey_type_hr_user","survey.type.hr.user","survey.model_survey_type","base.group_hr_user",1,1,1,0 -"access_survey_question_hr_user","survey.question.hr.user","survey.model_survey_question","base.group_hr_user",1,1,1,0>>>>>>> +"access_survey_question_hr_user","survey.question.hr.user","survey.model_survey_question","base.group_hr_user",1,1,1,0