solved conflict in p2p-nexteditor.py
authorMarius Sandu-Popa <sandupopamarius@gmail.com>
Fri, 11 Dec 2009 09:46:57 +0000 (11:46 +0200)
committerMarius Sandu-Popa <sandupopamarius@gmail.com>
Fri, 11 Dec 2009 09:46:57 +0000 (11:46 +0200)
commitd4160f8fa33b60f9df7ca5d9f6e7fe056847d421
tree05f3acbc8aaeb9a49f703c58c9aa8564008217e5
parentf61006e454abc7dade1e16b127a76bbe437886ef
parent593e4e4f449634403dc40d0560085e8b10950beb
solved conflict in p2p-nexteditor.py