1. psiphon
  2. Psiphon Circumvention System
  3. Pull requests

Pull requests

#4 Open
Repository
Psiphon Circumvention System
Branch
default

AMIN.bmp created online with Bitbucket

Bitbucket cannot automatically merge this request.

The commits that make up this pull request have been removed.

Bitbucket cannot automatically merge this request due to conflicts.

Review the conflicts on the Overview tab. You can then either decline the request or merge it manually on your local system using the following commands:

hg update 55dfc8e9c747
hg pull -r amin071/aminbmp-created-online-with-bitbucket-1391879482312 https://bitbucket.org/amin071/psiphon-circumvention-system-2
# Note: This will create a new head!
hg merge amin071/aminbmp-created-online-with-bitbucket-1391879482312
hg commit -m 'Merged in amin071/psiphon-circumvention-system-2/amin071/aminbmp-created-online-with-bitbucket-1391879482312 (pull request #4)'
Author
  1. amin 071
Reviewers
Description

AMIN.bmp created online with Bitbucket

Comments (1)