diff options
| author | Jayaram Pai | 2014-04-19 18:12:57 +0530 |
|---|---|---|
| committer | Jayaram Pai | 2014-04-19 18:12:57 +0530 |
| commit | 1f0b55a3e1500660945f0702aa00c90a23ca4d95 (patch) | |
| tree | 5ae3d6615149261115dbf3ebc5155db5267d8fe7 /static/website/templates/ajax-time-search.html | |
| parent | bf734e04b25ca97c897f431af8ac9966279337f5 (diff) | |
| parent | 2fbf3ecf6cae63691380ec8cc9df2c4beff29dae (diff) | |
| download | FOSSEE-Forum-1f0b55a3e1500660945f0702aa00c90a23ca4d95.tar.gz FOSSEE-Forum-1f0b55a3e1500660945f0702aa00c90a23ca4d95.tar.bz2 FOSSEE-Forum-1f0b55a3e1500660945f0702aa00c90a23ca4d95.zip | |
fixed merge conflict
Diffstat (limited to 'static/website/templates/ajax-time-search.html')
| -rw-r--r-- | static/website/templates/ajax-time-search.html | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/static/website/templates/ajax-time-search.html b/static/website/templates/ajax-time-search.html index 0b1673c..57be751 100644 --- a/static/website/templates/ajax-time-search.html +++ b/static/website/templates/ajax-time-search.html @@ -8,7 +8,7 @@ <th> Question</th> <th> Date</th> <th> Views</th> - <th> Replies</th> + <th> Answers</th> <th> User</th> {% for question in questions %} <tr> @@ -65,7 +65,7 @@ </td> <td> - {{ question.reply_set.count }} + {{ question.answer_set.count }} </td> <td> |