Files

Merge lp:~marcus-lundgren/pantheon-files/fix-1011672 into lp:~elementary-apps/pantheon-files/trunk

  1. fix-1011672
  2. Merge into trunk
Proposed by Marcus Lundgren
Status: Merged
Approved by: Jaap Broekhuizen
Approved revision: 846
Merged at revision: 846
Proposed branch: lp:~marcus-lundgren/pantheon-files/fix-1011672
Merge into: lp:~elementary-apps/pantheon-files/trunk
Diff against target: 18 lines (+0/-3)
1 file modified
data/pantheon-files.desktop.in (+0/-3)
To merge this branch: bzr merge lp:~marcus-lundgren/pantheon-files/fix-1011672
Reviewer Review Type Date Requested Status
Jaap Broekhuizen (community) Approve
Review via email: mp+109696@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Jaap Broekhuizen (jaapz-b) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'data/pantheon-files.desktop.in'
2--- data/pantheon-files.desktop.in 2012-06-11 09:25:17 +0000
3+++ data/pantheon-files.desktop.in 2012-06-11 17:56:25 +0000
4@@ -13,14 +13,11 @@
5
6 X-Ayatana-Desktop-Shortcuts=TabNew;WindowNew;Root
7
8-<<<<<<< TREE
9 [TabNew Shortcut Group]
10 Name=New _Tab
11 Exec=pantheon-files -t
12 TargetEnvironment=Unity
13
14-=======
15->>>>>>> MERGE-SOURCE
16 [WindowNew Shortcut Group]
17 Name=New _Window
18 Exec=pantheon-files

Subscribers

People subscribed via source and target branches

to all changes: