fixed conflict

2026-05-22 22:49:19 +00:00 · 2012-12-19 12:18:15 +05:30
parent 1a6a94b760 bb852e45e9
commit 4ecc785aab
28 changed files with 393 additions and 433 deletions
--- a/utilities/page/questions/questions.py
+++ b/utilities/page/questions/questions.py
@@ -35,7 +35,7 @@ def get_questions():
 			conds += ' and t1._user_tags like "%'+ t +'%"'
 	
 	return webnotes.conn.sql("""select t1.name, t1.owner, t1.question, t1.modified, t1._user_tags,
-			t2.first_name, t2.last_name, (select count(*) from tabAnswer where
+			(select count(*) from tabAnswer where
 			tabAnswer.question = t1.name) as answers
 		from tabQuestion t1, tabProfile t2
 		where t1.docstatus!=2