resolving merge conflict due to variable name change from main

2021-06-04 23:16:25 -04:00
parent 155271a0ee
commit d2f8e49037
2 changed files with 4 additions and 4 deletions
@@ -16,7 +16,7 @@ namespace O3DE::ProjectManager
 {
    ProjectInfo::ProjectInfo(const QString& path, const QString& projectName, const QString& displayName,
        const QString& origin, const QString& summary, const QString& imagePath, const QString& backgroundImagePath,
-        bool isNew)
+        bool needsBuild)
        : m_path(path)
        , m_projectName(projectName)
        , m_displayName(displayName)
@@ -24,7 +24,7 @@ namespace O3DE::ProjectManager
        , m_summary(summary)
        , m_imagePath(imagePath)
        , m_backgroundImagePath(backgroundImagePath)
-        , m_isNew(isNew)
+        , m_needsBuild(needsBuild)
    {
        m_userTags = QStringList();
        m_userTagsForRemoval = QStringList();