Solve merge conflict

opt/le-multiterminal/discover-devices

@@ -23,6 +23,11 @@
 # For input devices, it uses /proc/bus/input/devices
 # For video cardes, it uses the "discover" package.
 
+<<<<<<< HEAD
+=======
+# TODO: find a decent way to do all this.
+
+>>>>>>> f2bed6673c6e31075587f1e43c5fb606dbc48f78
 DISCOVER=/sbin/discover
 
 # This function prints the physical addresses of the mice found

opt/le-multiterminal/find-devices.sh

@@ -70,20 +70,13 @@ find_keyboard () {
 
 		# Write in configuration file
 		if [[ $fKey -gt 1 ]]; then
-			echo "$wNum : ${OUTPUTS[$((wNum-1))]}"
 			echo -e "[Seat:$SEAT_NAME]\nxserver-command=xephyr-wrapper :90.0 -output ${OUTPUTS[$((wNum-1))]}\n" >> configuracao
 		fi
 
-		echo "*************** SAINDO"
-
 		exit 1
 	else
 		echo "CAN NOT FIND KEYBOARD"
 
-		echo "*************** SAINDO"
-
 		exit 0
 	fi
-
-	echo "*************** SAINDO"
 }
\ No newline at end of file

opt/le-multiterminal/multiseat-controller.sh

@@ -152,4 +152,5 @@ done
 # Cleans the system by killing all the processes and files it has created
 kill_jobs
 
+
 exit 0

opt/le-multiterminal/window-acess.sh

@@ -47,7 +47,6 @@ create_window () {
 	# Creates a new window for writing on this output
 	WINDOW_NAME=w$(($WINDOW_COUNTER+1))
 	$NEW_WINDOW $SCREEN_RESOLUTION+0+0 $WINDOW_NAME &
-	#sleep 1
 
 	# Try to access the window
 	xwininfo -name $WINDOW_NAME