From: Marius Sandu-Popa <sandupopamarius@gmail.com>
Date: Fri, 11 Dec 2009 09:46:57 +0000 (+0200)
Subject: solved conflict in p2p-nexteditor.py
X-Git-Tag: getopt_long~227
X-Git-Url: http://p2p-next.cs.pub.ro/gitweb/?a=commitdiff_plain;h=d4160f8fa33b60f9df7ca5d9f6e7fe056847d421;p=cs-p2p-next.git

solved conflict in p2p-nexteditor.py
---

d4160f8fa33b60f9df7ca5d9f6e7fe056847d421