resolved conflicts

ui/src/app/pages/apps-routes/app-list/app-list.page.ts

@@ -69,14 +69,7 @@ export class AppListPage {
 
   private watchNewlyRecovered (): Observable<unknown> {
     return this.patch.watch$('package-data').pipe(
-<<<<<<< HEAD
       filter((pkgs) => Object.keys(pkgs).length !== this.pkgs.length),
-=======
-      filter((pkgs) => {
-        console.log('PKGSPKGS', pkgs)
-        return !!pkgs && Object.keys(pkgs).length !== this.pkgs.length
-      }),
->>>>>>> 672a93ed (but on login)
       tap((pkgs) => {
         const ids = Object.keys(pkgs)
         const newIds = ids.filter(

ui/src/app/pages/apps-routes/app-show/app-show.page.ts

@@ -15,10 +15,7 @@ import { ErrorToastService } from 'src/app/services/error-toast.service'
 import { AppConfigPage } from 'src/app/modals/app-config/app-config.page'
 import { filter } from 'rxjs/operators'
 import { MarkdownPage } from 'src/app/modals/markdown/markdown.page'
-<<<<<<< HEAD
 import { Pipe, PipeTransform } from '@angular/core'
-=======
->>>>>>> 19161705 (drew water edits)
 import { packageLoadingProgress, ProgressData } from 'src/app/util/package-loading-progress'
 
 @Component({