[Title] bug fix configuration value

[Desc.] fix error code
[Issue] -

diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/configuration/ConfigurationDialogValues.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/configuration/ConfigurationDialogValues.java
index a732734..6a64010 100644 (file)
--- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/configuration/ConfigurationDialogValues.java
+++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/configuration/ConfigurationDialogValues.java
@@ -106,16 +106,6 @@ public class ConfigurationDialogValues {
                                        // ConfigureLabels.FEATURE_SYSCALL_NETWORK,
                                        // ConfigureLabels.FEATURE_SYSCALL_DESC,
                                        ConfigureLabels.FEATURE_CONTEXT_SWITCH,
-<<<<<<< Updated upstream
-//                                     ConfigureLabels.FEATURE_SYSTEM_CPU,
-//                                     ConfigureLabels.FEATURE_SYSTEM_PROCESSES,
-//                                     ConfigureLabels.FEATURE_SYSTEM_MEMORY,
-//                                     ConfigureLabels.FEATURE_SYSTEM_DISK,
-//                                     ConfigureLabels.FEATURE_SYSTEM_NETWORK,
-//                                     ConfigureLabels.FEATURE_SYSTEM_DEVICE,
-                                       ConfigureLabels.FEATURE_SCREENSHOT,
-                                       ConfigureLabels.FEATURE_USER_EVENT,
-=======
                                        ConfigureLabels.FEATURE_SYSTEM,
                                        // ConfigureLabels.FEATURE_SYSTEM_CPU,
                                        // ConfigureLabels.FEATURE_SYSTEM_PROCESSES,
@@ -123,7 +113,6 @@ public class ConfigurationDialogValues {
                                        // ConfigureLabels.FEATURE_SYSTEM_DISK,
                                        // ConfigureLabels.FEATURE_SYSTEM_NETWORK,
                                        // ConfigureLabels.FEATURE_SYSTEM_DEVICE,
->>>>>>> Stashed changes
                                        ConfigureLabels.FEATURE_SYSTEM_ENERGY };
                        mConfig = ConfigureManager.getInstance();
                }