fix

Author: Rirusha

src/apa/search.vala

@@ -48,18 +48,11 @@ namespace Apa {
         var cachier = Cachier.get_default ();
         Package[] all_packages;
 
-<<<<<<< HEAD
-        try {
-            result = yield client.get_packages_async (Pk.Filter.NONE, null, () => {});
-        } catch (Error e) {
-            throw new CommandError.COMMON (e.message);
-=======
         if (installed) {
             all_packages = yield cachier.get_installed_packages ();
 
         } else {
             all_packages = yield cachier.get_all_packages ();
->>>>>>> 1587380 (wip)
         }
 
         var search_result = new Gee.ArrayList<string> ();

src/cachier/package-list.vala

@@ -19,5 +19,5 @@
 
 public sealed class Apa.PackageList : Object {
 
-    public Gee.ArrayList<Package> packages { get; set; default = new Gee.ArrayList<Package> (); } 
+    public Gee.ArrayList<Package> packages { get; set; default = new Gee.ArrayList<Package> (); }
 }

src/cachier/package.vala

@@ -36,8 +36,6 @@ public class Apa.Package : Object {
 
         //  if (parts.length > 0) {
         //      var parts2 = parts[0].split (":");
-
-
         //  }
 
         Object (