X-Git-Url: https://defaria.com/gitweb/?a=blobdiff_plain;f=clearadm%2Flib%2FClearadm.pm;h=a9bcb364e9f1d67937cfe92d7ca2f597c8fa9919;hb=HEAD;hp=1f74aafb28be02fbf3a7069baf6a58a4419c491d;hpb=3c28a301742e8f8cdd35825fd6ebe4f842a510c7;p=clearscm.git

diff --git a/clearadm/lib/Clearadm.pm b/clearadm/lib/Clearadm.pm
index 1f74aaf..a9bcb36 100644
--- a/clearadm/lib/Clearadm.pm
+++ b/clearadm/lib/Clearadm.pm
@@ -680,12 +680,17 @@ sub GetVob($$) {
   } # if
 } # GetVob
 
+<<<<<<< HEAD
 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/^\\/\\\\/;