Xubuntu Default Settings

Merge lp:~thad-fisch-deactivatedaccount/xubuntu-default-settings/hide-thunar-settings into lp:~xubuntu-dev/xubuntu-default-settings/trunk

  1. hide-thunar-settings
  2. Merge into trunk
Proposed by Sean Davis
Status: Merged
Merged at revision: 550
Proposed branch: lp:~thad-fisch-deactivatedaccount/xubuntu-default-settings/hide-thunar-settings
Merge into: lp:~xubuntu-dev/xubuntu-default-settings/trunk
Diff against target: 8 lines (+2/-0) (has conflicts)
1 file modified
usr/share/xubuntu/applications/thunar-settings.desktop (+2/-0)
Conflict adding file usr/share/xubuntu/applications/thunar-settings.desktop.  Moved existing file to usr/share/xubuntu/applications/thunar-settings.desktop.moved.
To merge this branch: bzr merge lp:~thad-fisch-deactivatedaccount/xubuntu-default-settings/hide-thunar-settings
Reviewer Review Type Date Requested Status
Sean Davis Approve
Review via email: mp+249145@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Sean Davis (bluesabre) wrote :

You beat me to it, but I didn't notice the merge. Put the credit in your name and marked it as such. Thanks for your help!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== added file 'usr/share/xubuntu/applications/thunar-settings.desktop'
2--- usr/share/xubuntu/applications/thunar-settings.desktop 1970-01-01 00:00:00 +0000
3+++ usr/share/xubuntu/applications/thunar-settings.desktop 2015-02-10 03:18:34 +0000
4@@ -0,0 +1,2 @@
5+[Desktop Entry]
6+NoDisplay=true
7
8=== renamed file 'usr/share/xubuntu/applications/thunar-settings.desktop' => 'usr/share/xubuntu/applications/thunar-settings.desktop.moved'

Subscribers

People subscribed via source and target branches

to all changes:
to status/vote changes: