resolve conflict

2 files changed, 9 insertions, 1 deletions

diff --git a/README.markdown b/README.markdown
index c97ef92..a1483cf 100644
--- a/README.markdown
+++ b/README.markdown
@@ -3,7 +3,7 @@ ipwebcam-gst
 
 This is a shell script which allows Android users to use their phones as a webcam/microphone in Linux. The setup is as follows:
 
-* [IP Webcam](https://market.android.com/details?id=com.pas.webcam) (on the phone) serves up a MJPEG live video stream and a WAV live audio stream through HTTP (port 8080 by default).
+* [IP Webcam](https://market.android.com/details?id=com.pas.webcam) (on the phone) serves up a MJPEG live video stream and a WAV/Opus live audio stream through HTTP (port 8080 by default).
 * If the phone is plugged to USB and ADB is available, the HTTP port in the phone is bridged to the same port in the computer, using ADB port forwarding. This is much faster than using Wi-Fi, and the shell will be able to start the IP Webcam application on the phone directly. The script supports Wi-Fi as well, but it can be rather choppy with bad reception, so I wouldn't recommend it.
 * From the local port in the computer, a GStreamer graph takes the MJPEG live video stream and dumps it to a loopback V4L2 device, using [v4l2loopback](https://github.com/umlaeute/v4l2loopback). The audio stream is dumped to a PulseAudio null sink.
 * Most videochat software in Linux is compatible with `v4l2loopback`: Skype 2.1 (*not* the latest 2.2, it seems), Cheese, Empathy, Google Talk video chats and Google+ hangouts should work.
diff --git a/prepare-videochat.sh b/prepare-videochat.sh
index 00e4bf8..d15d816 100755
--- a/prepare-videochat.sh
+++ b/prepare-videochat.sh
@@ -146,8 +146,13 @@ has_kernel_module() {
     # Checks if module exists in system (but do not loads it)
     MODULE="$1"
     if lsmod | grep "$MODULE" >/dev/null 2>/dev/null; then
+<<<<<<< HEAD
         # echo "$MODULE is loaded! So it exists."
         return 0
+=======
+        # echo "$MODULE is loaded! Do nothnig."
+        :
+>>>>>>> bluezio-rep/master
     else
        # Determining kernel object existence
        # I do not know why, but using -q in egrep makes it always return 1, so do not use it
@@ -180,6 +185,7 @@ confirm() {
 can_run() {
     # It's either the path to a file, or the name of an executable in $PATH
     which "$1" >/dev/null 2>/dev/null
+<<<<<<< HEAD
 }
 
 install_package() {
@@ -189,6 +195,8 @@ install_package() {
     elif [ $DIST = "Arch" ]; then
         error "Please install $1 package"
     fi
+=======
+>>>>>>> bluezio-rep/master
 }
 
 start_adb() {