diff options
Diffstat (limited to 'activity/activity.info')
| -rwxr-xr-x | activity/activity.info | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/activity/activity.info b/activity/activity.info index 3ffc4c1..912a9bf 100755 --- a/activity/activity.info +++ b/activity/activity.info @@ -2,10 +2,6 @@ name = NutrinoWeb activity_version = 1 service_name = org.laptop.NutrinoWebActivity -<<<<<<< HEAD -icon = activity-NutriWeb -======= icon = activity-nutrinoweb ->>>>>>> b1db04eb335745ba1261e18bbf0602ab9740ab4f class = nutrinoweb.activity.NutrinoWebActivity license = gplv3 |