D18230: Added admin mode to question and answer activity

[Johnny Jazeix]

jjazeix added a comment.


  In D18230#450369 <https://phabricator.kde.org/D18230#450369>, @echarruau wrote:
  
  > Hi,
  >  I am working from a fresh version of master and get the same problem when I want to apply diff for both D18230 <https://phabricator.kde.org/D18230>.diff
  >
  >   and D18600.diff.
  >
  > error: patch failed: src/activities/activities.txt:119
  >  Could you on your side apply your patch to see if it is working?
  > Thanks
  
  
  That's normal. That's 2 separate independant patches doing different things. If they collide, there is nothing to do, just apply one or the other. Or update the second patch to not update activities.txt file and do the change by hand after applying the patch.

REPOSITORY
  R2 GCompris

REVISION DETAIL
  https://phabricator.kde.org/D18230

To: AkshayCHD, #gcompris_activities
Cc: jjazeix, echarruau, kde-edu, #gcompris_activities, sanjayshetty, parimalprasoon, harrymecwan, ganeshredcobra, nityanandkumar, andreask, rahulyadav, narvaez, scagarwal, apol, timotheegiet, bcoudoin
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.kde.org/pipermail/kde-edu/attachments/20190416/f375dd67/attachment.html>