Merge "res_pjsip_outbound_registration.c: Fix whitespace conflict potential."
authorJoshua Colp <jcolp@digium.com>
Tue, 23 Jun 2015 17:54:03 +0000 (12:54 -0500)
committerGerrit Code Review <gerrit2@gerrit.digium.api>
Tue, 23 Jun 2015 17:54:03 +0000 (12:54 -0500)
commit39c79cd6fb661269b8505247a2dea1ae7b7aad81
treef0a008e4f726dc0cec865eac883b6059ef26b939
parent44c3c392e3642cdab0ed85f1f4cf72daf9f2cb9a
parent096b27d9d2e399dc7de7eab8252c8b02286e0702
Merge "res_pjsip_outbound_registration.c: Fix whitespace conflict potential."