diff options
| author | Walter Bender <walter.bender@gmail.com> | 2012-10-27 16:34:57 (GMT) |
|---|---|---|
| committer | Walter Bender <walter.bender@gmail.com> | 2012-10-27 16:34:57 (GMT) |
| commit | f38225d5706ee1d42354c821d634138e27ca9894 (patch) | |
| tree | 6eb12d3b092729d535b8accf17c1eef0530a7a02 | |
| parent | 06f848c0002b48d8103da89fd1b8fc1f757895a3 (diff) | |
more merging conflicts resolved
| -rw-r--r-- | activity/activity.info | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/activity/activity.info b/activity/activity.info index a15d945..abf6e84 100644 --- a/activity/activity.info +++ b/activity/activity.info @@ -3,11 +3,7 @@ name = Ruler bundle_id = com.laptop.Ruler exec = sugar-activity RulerActivity.RulerActivity icon = activity-ruler -<<<<<<< HEAD -activity_version = 20 -======= activity_version = 21 ->>>>>>> c1ae3b7b6eedf94357961f25ad764802154ac360 show_launcher = yes license = GPLv3+ summary = scaled images of a ruler, protractor, and a checker board |