summary refs log tree commit diff
diff options
context:
space:
mode:
authorBarton E. Schaefer <schaefer@zsh.org>2014-07-23 08:49:17 -0700
committerBarton E. Schaefer <schaefer@zsh.org>2014-07-23 08:49:17 -0700
commit52d4cd2e91408dec22f46c3c1a8f05d252560437 (patch)
treeb8adc205436317bb8e2685965c9dd85af6cb179b
parent0702cda61bdf821d6bff8b58f1ccd475ffaddae0 (diff)
downloadzsh-52d4cd2e91408dec22f46c3c1a8f05d252560437.tar.gz
zsh-52d4cd2e91408dec22f46c3c1a8f05d252560437.tar.xz
zsh-52d4cd2e91408dec22f46c3c1a8f05d252560437.zip
Resolve conflict with origin/master
-rw-r--r--Completion/Unix/Command/_nm2
1 files changed, 1 insertions, 1 deletions
diff --git a/Completion/Unix/Command/_nm b/Completion/Unix/Command/_nm
index 5638014d6..3ceb8c932 100644
--- a/Completion/Unix/Command/_nm
+++ b/Completion/Unix/Command/_nm
@@ -21,7 +21,7 @@ case $state in
   _alternative \
     "object-files:object file:_path_files -g '*.o'" \
     "executable-files:executable file:_path_files -g '*(*)'" \
-    "dynamic-libraries:dynamic library:_path_files -g '*.so'" \
+    "dynamic-libraries:dynamic library:_path_files -g '*.so(.*)#'" \
     "static-libraries:static library:_path_files -g '*.a'" \
     "directories:directory:_path_files -g '*(/)'" && ret=0
   ;;