about summary refs log tree commit diff
path: root/src/libstd
diff options
context:
space:
mode:
authorTim Chevalier <chevalier@alum.wellesley.edu>2012-10-03 14:28:47 -0700
committerTim Chevalier <chevalier@alum.wellesley.edu>2012-10-03 14:28:47 -0700
commitc73e3320f89111a3d782314b5033127234e1fe99 (patch)
treefbd669f68859187182356a18394a2952a50ba5b1 /src/libstd
parentb6692500ffc141cdf202af9c9f88782c396cd333 (diff)
Remove crud
Diffstat (limited to 'src/libstd')
-rw-r--r--src/libstd/getopts.rs1
1 files changed, 0 insertions, 1 deletions
diff --git a/src/libstd/getopts.rs b/src/libstd/getopts.rs
index 8fd775c4773..771eaaeca7f 100644
--- a/src/libstd/getopts.rs
+++ b/src/libstd/getopts.rs
@@ -381,7 +381,6 @@ pub fn opt_str(mm: Matches, nm: &str) -> ~str {
  * option took an argument
  */
 pub fn opts_str(mm: Matches, names: &[~str]) -> ~str {
->>>>>>> Remove uses of + mode from libstd
     for vec::each(names) |nm| {
         match opt_val(mm, *nm) {
           Val(copy s) => return s,