3199 fix merge error in TagsManager where both old and new arguments were in method call

This commit is contained in:
William Schaefer 2017-11-15 12:25:18 -05:00
parent 77b874e075
commit 3fda67bb22

View File

@ -266,7 +266,7 @@ public class TagsManager implements Closeable {
* name to the case database. * name to the case database.
*/ */
public synchronized TagName addTagName(String displayName, String description, TagName.HTML_COLOR color) throws TagNameAlreadyExistsException, TskCoreException { public synchronized TagName addTagName(String displayName, String description, TagName.HTML_COLOR color) throws TagNameAlreadyExistsException, TskCoreException {
return addTagName(displayName, description, color, knownStatus,TskData.FileKnown.UNKNOWN); return addTagName(displayName, description, color, TskData.FileKnown.UNKNOWN);
} }
/** /**