Some minor changes

contents/config/main.xml

@@ -116,7 +116,7 @@
     <label>If false, it shows only the placeHolder text</label>
   </entry>
   <entry name="placeHolder" type="string">
-    <default></default>
+    <default>KDE Plasma</default>
     <label>The text shown if nothing else is available</label>
   </entry>
   <entry name="formFactor" type="Int">

contents/ui/TitleLayout.qml

@@ -78,14 +78,10 @@ GridLayout{
         Layout.preferredWidth : Layout.minimumWidth
         Layout.preferredHeight: Layout.minimumHeight
 
-<<<<<<< Updated upstream
-        visible: mainIcon.visible && (firstTxt.visible || lastTxt.visible) && plasmoid.configuration.style !== 4 /*NoText*/
-=======
         Layout.maximumHeight  : Layout.minimumHeight
         Layout.maximumWidth   : Layout.minimumWidth
 
-        visible               : mainIcon.visible && && (firstTxt.visible || lastTxt.visible) && !root.isNoTextStyle
->>>>>>> Stashed changes
+        visible               : mainIcon.visible && (firstTxt.visible || lastTxt.visible) && !isNoTextStyle
     }
     Item{
         id: textsContainer
@@ -141,7 +137,7 @@ GridLayout{
                     bold                : plasmoid.configuration.boldFont
                     italic              : plasmoid.configuration.italicFont
                 }
-                visible                 : !isUsedForMetrics && (!showsTitleText || !exceedsApplicationText)
+                visible                 : !(!isUsedForMetrics && showsTitleText && exceedsApplicationText)
 
                 readonly property bool showsTitleText      : root.isTitleStyle       || root.isTitleApplicationStyle
                 readonly property bool showsApplicationText: root.isApplicationStyle || root.isApplicationTitleStyle
@@ -152,24 +148,11 @@ GridLayout{
                     else if (root.isTitleApplicationStyle
                                && activeTaskItem
                                && activeTaskItem.appName !== activeTaskItem.title
-<<<<<<< Updated upstream
-                               && titleLayout.exceedsAvailableSpace){ /*TitleApplication*/
-                        return Text.ElideMiddle;
-                    } else if (showsApplicationText && !isUsedForMetrics && exceedsApplicationText) {
-                        return Text.ElideMiddle;
-                    }
-
-                    return Text.ElideNone;
-                }
-
-                visible: text !== "" && !(!isUsedForMetrics && showsTitleText && exceedsApplicationText)
-=======
                                && titleLayout.exceedsAvailableSpace)
                                                                                                   return plasmoid.configuration.elideMiddle ? Text.ElideMiddle : Text.ElideRight;
                     else if (showsApplicationText && !isUsedForMetrics && exceedsApplicationText) return plasmoid.configuration.elideMiddle ? Text.ElideMiddle : Text.ElideRight;
                     else                                                                          return Text.ElideNone;
                 }
->>>>>>> Stashed changes
             }
 
             Label{

contents/ui/main.qml

@@ -73,13 +73,7 @@ PlasmoidItem {
 
     readonly property Item activeTaskItem: windowInfoLoader.item.activeTaskItem
 
-    property string fallBackText: {
-        if (!plasmoid.configuration.filterActivityInfo) {
-            return plasmoid.configuration.placeHolder;
-        } else {
-            return fullActivityInfo.name;
-        }
-    }
+    property string fallBackText: plasmoid.configuration.filterActivityInfo ? fullActivityInfo.name : plasmoid.configuration.placeHolder
 
     readonly property string firstTitleText: {
         if      (!activeTaskItem)                     return "";
@@ -103,12 +97,12 @@ PlasmoidItem {
     // Do Not Touch !!
     // BEGIN Tasks logic
     TaskManager.ActivityInfo { id: activityInfo }
+
     Activities.ActivityInfo {
         id: fullActivityInfo
         activityId: ":current"
     }
     TaskManager.VirtualDesktopInfo { id: virtualDesktopInfo }
-
     Loader {
         id: windowInfoLoader
         sourceComponent: plasmaTasksModel

metadata.json

@@ -13,11 +13,7 @@
         "Id": "org.kde.windowtitle",
         "License": "GPLv2",
         "Name": "Window Title",
-<<<<<<< Updated upstream
-        "Version": "0.7.1",
-=======
         "Version": "0.5.5",
->>>>>>> Stashed changes
         "Website": "https://github.com/psifidotos/applet-window-title"
     },
     "Keyword": "window title icon",