Module: libav.org Branch: master Commit: 173d6c0e57103501eb76303181909e99abb3522e
Author: Vladimir Pantelic <vladi...@lgf.net> Committer: Diego Biurrun <di...@biurrun.de> Date: Sat Sep 3 17:23:40 2011 +0200 remove references to past conflicts in the conflict resolution section Signed-off-by: Diego Biurrun <di...@biurrun.de> --- src/about | 9 ++------- 1 files changed, 2 insertions(+), 7 deletions(-) diff --git a/src/about b/src/about index 837ff4b..6a7fb31 100644 --- a/src/about +++ b/src/about @@ -138,13 +138,8 @@ should actively reach out to integrate branches into the main tree <h2>Personal Conflict Resolution</h2> -<p> Conflicts, especially personal ones, have been the bane of the -FFmpeg project for many years. The current way of letting conflicts -continue and continue to escalate creates nothing but downward spirals -and unhappiness. </p> - -<p> Personal conflicts shall be assisted by mediators in the -future. When a conflict between two (or more) people arises and +<p> Personal conflicts shall be assisted by mediators. +When a conflict between two (or more) people arises and threatens to spiral downwards, anybody may ask for a mediator to step in. The role of the mediator is to pull the fighters apart, calm them down, listen to each side and try to restore and aid civil communication _______________________________________________ libav-commits mailing list libav-commits@libav.org https://lists.libav.org/mailman/listinfo/libav-commits
