Skip to content

Commit

Permalink
Removed merge comment
Browse files Browse the repository at this point in the history
  • Loading branch information
Lars Lindholm committed Jul 21, 2014
1 parent e3e7d53 commit 253da05
Showing 1 changed file with 0 additions and 1 deletion.
1 change: 0 additions & 1 deletion README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,6 @@ microphone is unmuted.

Resets the volume to previous unmuted value.

<<<<<<< HEAD
#### startAudioTransmit(url, type)

Starts transmitting microphone input to the camera speaker. The optional `type` parameter can be used for future implementations of other protocols, currently only the Axis audio transmit api is supported. For Axis cameras the `url` parameter should be in the format - `http://server:port/axis-cgi/audio/transmit.cgi`.
Expand Down

0 comments on commit 253da05

Please sign in to comment.