From 4c7d554831c1b4a917b1ff828ff4d0499f2d75ce Mon Sep 17 00:00:00 2001 From: "Andrew E. Bruno" Date: Mon, 6 Jun 2016 20:52:55 -0400 Subject: [PATCH] Update docs --- README.rst | 9 --------- 1 file changed, 9 deletions(-) diff --git a/README.rst b/README.rst index a4d05833d..a5cc7a293 100644 --- a/README.rst +++ b/README.rst @@ -91,15 +91,6 @@ version (``mb2 -x``). To add git hashes to the package version modify the # tagver piece copied from tar_git service if [[ $(echo $tag | grep "/") ]] ; then -*Note*: There is a pull request currently under review `here -`_ which enables device linking. -Until this is accepted manual merging is required:: - - $ cd vendor/github.com/janimo/textsecure - $ git remote add aebruno https://github.com/aebruno/textsecure.git - $ git fetch aebruno - $ git merge aebruno/device-provisioning - If you have the SailfishOS Emulator you can install the rpm into the emulator directly with::