From aa5b960ace514e036d932f6a45dc0c3a81f0db4a Mon Sep 17 00:00:00 2001
From: gcontini <1121667+gcontini@users.noreply.github.com>
Date: 周六, 16 5月 2020 21:54:27 +0800
Subject: [PATCH] Merge branch 'develop' of https://github.com/open-license-manager/open-license-manager.git into develop
---
src/library/locate/ApplicationFolder.hpp | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/library/locate/ApplicationFolder.hpp b/src/library/locate/ApplicationFolder.hpp
index b98182e..3e2163d 100644
--- a/src/library/locate/ApplicationFolder.hpp
+++ b/src/library/locate/ApplicationFolder.hpp
@@ -15,14 +15,14 @@
namespace license {
namespace locate {
-class ApplicationFolder: public LocatorStrategy {
+class ApplicationFolder : public LocatorStrategy {
public:
ApplicationFolder();
- virtual const std::vector<std::string> licenseLocations(EventRegistry& eventRegistry) const;
+ const virtual std::vector<std::string> license_locations(EventRegistry& eventRegistry);
virtual ~ApplicationFolder();
};
-}
+} // namespace locate
} /* namespace license */
#endif /* SRC_LIBRARY_RETRIEVERS_APPLICATIONFOLDER_H_ */
--
Gitblit v1.9.1