Merge branch 'upstream'

[debian/sudo] / sudo.cat

diff --git a/sudo.cat b/sudo.cat
index c86ab458bef048a4979e81b0067f2bd741e6956e..1bb8ece41eb622d3caf1ac091f32476a2ab26f96 100644 (file)
--- a/sudo.cat
+++ b/sudo.cat
@@ -61,7 +61,11 @@ D\bDE\bES\bSC\bCR\bRI\bIP\bPT\bTI\bIO\bON\bN
 
 
 
+<<<<<<< HEAD:sudo.cat
 1.6.9p15                  March 23, 2008                        1
+=======
+1.6.9p16                   May  8, 2008                         1
+>>>>>>> 17fe41bae8a65fb88683c9795414556ed9b636e9:sudo.cat
 
 
 
@@ -127,7 +131,11 @@ O\bOP\bPT\bTI\bIO\bON\bNS\bS
 
 
 
+<<<<<<< HEAD:sudo.cat
 1.6.9p15                  March 23, 2008                        2
+=======
+1.6.9p16                   May  8, 2008                         2
+>>>>>>> 17fe41bae8a65fb88683c9795414556ed9b636e9:sudo.cat
 
 
 
@@ -193,7 +201,11 @@ SUDO(1m)               MAINTENANCE COMMANDS              SUDO(1m)
 
 
 
+<<<<<<< HEAD:sudo.cat
 1.6.9p15                  March 23, 2008                        3
+=======
+1.6.9p16                   May  8, 2008                         3
+>>>>>>> 17fe41bae8a65fb88683c9795414556ed9b636e9:sudo.cat
 
 
 
@@ -259,7 +271,11 @@ SUDO(1m)               MAINTENANCE COMMANDS              SUDO(1m)
 
 
 
+<<<<<<< HEAD:sudo.cat
 1.6.9p15                  March 23, 2008                        4
+=======
+1.6.9p16                   May  8, 2008                         4
+>>>>>>> 17fe41bae8a65fb88683c9795414556ed9b636e9:sudo.cat
 
 
 
@@ -325,7 +341,11 @@ S\bSE\bEC\bCU\bUR\bRI\bIT\bTY\bY N\bNO\bOT\bTE\bES\bS
 
 
 
+<<<<<<< HEAD:sudo.cat
 1.6.9p15                  March 23, 2008                        5
+=======
+1.6.9p16                   May  8, 2008                         5
+>>>>>>> 17fe41bae8a65fb88683c9795414556ed9b636e9:sudo.cat
 
 
 
@@ -391,7 +411,11 @@ SUDO(1m)               MAINTENANCE COMMANDS              SUDO(1m)
 
 
 
+<<<<<<< HEAD:sudo.cat
 1.6.9p15                  March 23, 2008                        6
+=======
+1.6.9p16                   May  8, 2008                         6
+>>>>>>> 17fe41bae8a65fb88683c9795414556ed9b636e9:sudo.cat
 
 
 
@@ -457,7 +481,11 @@ F\bFI\bIL\bLE\bES\bS
 
 
 
+<<<<<<< HEAD:sudo.cat
 1.6.9p15                  March 23, 2008                        7
+=======
+1.6.9p16                   May  8, 2008                         7
+>>>>>>> 17fe41bae8a65fb88683c9795414556ed9b636e9:sudo.cat
 
 
 
@@ -523,7 +551,11 @@ C\bCA\bAV\bVE\bEA\bAT\bTS\bS
 
 
 
+<<<<<<< HEAD:sudo.cat
 1.6.9p15                  March 23, 2008                        8
+=======
+1.6.9p16                   May  8, 2008                         8
+>>>>>>> 17fe41bae8a65fb88683c9795414556ed9b636e9:sudo.cat
 
 
 
@@ -589,6 +621,10 @@ D\bDI\bIS\bSC\bCL\bLA\bAI\bIM\bME\bER\bR
 
 
 
+<<<<<<< HEAD:sudo.cat
 1.6.9p15                  March 23, 2008                        9
+=======
+1.6.9p16                   May  8, 2008                         9
+>>>>>>> 17fe41bae8a65fb88683c9795414556ed9b636e9:sudo.cat