projects
/
clearscm.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fixed up capture
[clearscm.git]
/
clearadm
/
lib
/
Clearadm.pm
diff --git
a/clearadm/lib/Clearadm.pm
b/clearadm/lib/Clearadm.pm
index
1f74aaf
..
a9bcb36
100644
(file)
--- a/
clearadm/lib/Clearadm.pm
+++ b/
clearadm/lib/Clearadm.pm
@@
-680,12
+680,17
@@
sub GetVob($$) {
} # if
} # GetVob
} # if
} # GetVob
+<<<<<<< HEAD
sub FindVobStorage(;$$) {
my ($self, $tag, $region) = @_;
$tag ||= '';
$region ||= '';
sub FindVobStorage(;$$) {
my ($self, $tag, $region) = @_;
$tag ||= '';
$region ||= '';
+=======
+sub FindVob($;$) {
+ my ($self, $tag, $region) = @_;
+
# Windows vob tags begin with "\", which is problematic. The solution is to
# escape the "\"
$tag =~ s/^\\/\\\\/;
# Windows vob tags begin with "\", which is problematic. The solution is to
# escape the "\"
$tag =~ s/^\\/\\\\/;