Skip to content

Commit

Permalink
'#43 Corrects last merge conflict.
Browse files Browse the repository at this point in the history
  • Loading branch information
patrickdalla committed Feb 8, 2024
1 parent fe1f645 commit 306a0a8
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions iped-app/resources/config/conf/CategoriesConfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -96,8 +96,8 @@
{"name": "AppRoles"},
{"name":"Installed via PlayStore", "mimes":["application/aleapp-installedapps-vending"]},
{"name":"Update information", "mimes":["application/aleapp-installedapps-gms"]},
{"name":"Google User Linked Apps", "mimes":["application/aleapp-installedapps-library"],
{"name": "Android Applications", "mimes": ["application/vnd.android.package-archive"]}}
{"name":"Google User Linked Apps", "mimes":["application/aleapp-installedapps-library"]},
{"name": "Android Applications", "mimes": ["application/vnd.android.package-archive"]}
]},
{"name": "Unallocated", "mimes": ["application/x-unallocated"]},
{"name": "File Slacks", "mimes": ["application/x-fileslack"]},
Expand Down

0 comments on commit 306a0a8

Please sign in to comment.