Changeset 28

Show
Ignore:
Timestamp:
11/28/06 18:16:05 (2 years ago)
Author:
kindlund
Message:

resolved conflict

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • honeyclient/branches/bug/42/lib/HoneyClient/Agent/Integrity.pm

    r27 r28  
    264264    '/cygdrive/c/WINDOWS/system32/wbem/', 
    265265    '/cygdrive/c/WINDOWS/PCHEALTH/HELPCTR/DataColl/', 
    266     #Can't be included cause it's user specific 
    267     #'/cygdrive/c/WINDOWS/SoftwareDistribution/WuRedir/9482F4B4-E343-43B6-B170-9A65BC822C77/wuredir.cab.bak', 
    268266    '/cygdrive/c/Documents and Settings/All Users/Application Data/Microsoft/Network/Downloader/', 
    269267    '/cygdrive/c/Documents and Settings/Administrator/Application Data/Mozilla/Firefox/Profiles/',