[SCM] Debian packaging of nama branch, master, updated. 410fb1f736bf95e774f0493c6509716eaead2479

[Joel Roth]

The following commit has been merged in the master branch:
commit b301057f4d6ad1ac1c186b7da6599c2037966f3d
Author: Joel Roth <joelz at pobox.com>
Date:   Mon Aug 8 08:14:31 2011 -1000

    remove merge conflicts in script/nama

diff --git a/script/nama b/script/nama
index e518801..794436e 100755
--- a/script/nama
+++ b/script/nama
@@ -1137,11 +1137,7 @@ C<pan_back>
 
 =back
 
-<<<<<<< HEAD
-=head4 B<show_tracks> (show lt) - Show track status
-=======
 =head4 B<show_tracks> (lt) - Show track status
->>>>>>> upstream/1.076
 
 =over 8
 
@@ -1149,11 +1145,7 @@ C<show_tracks>
 
 =back
 
-<<<<<<< HEAD
-=head4 B<show_tracks_all> (sha showa) - Show status of all tracks, visible and hidden
-=======
 =head4 B<show_tracks_all> (show sha showa) - Show status of all tracks, visible and hidden
->>>>>>> upstream/1.076
 
 =over 8
 
@@ -1498,19 +1490,11 @@ C<loop_disable>
 
 =head2 Effect commands
 
-<<<<<<< HEAD
-=head4 B<add_controller> (acl) - Add a controller to an operator (use mfx to modify, rfx to remove)
-
-=over 8
-
-C<add_controller> <s_parent_id> <s_effect_code> [ <f_param1> <f_param2>...]
-=======
 =head4 B<add_controller> (acl) - Add a controller to an operator (current operator, by default) use mfx to modify, rfx to remove)
 
 =over 8
 
 C<add_controller> [<s_operator_id>] <s_effect_code> [ <f_param1> <f_param2>...]
->>>>>>> upstream/1.076
 
 =back
 

-- 
Debian packaging of nama