Ubuntu One Client

Merge lp:~dobey/ubuntuone-client/ignore-lock into lp:ubuntuone-client

  1. ignore-lock
  2. Merge into trunk
Proposed by dobey
Status: Merged
Approved by: Facundo Batista
Approved revision: 1349
Merged at revision: 1349
Proposed branch: lp:~dobey/ubuntuone-client/ignore-lock
Merge into: lp:ubuntuone-client
Diff against target: 11 lines (+1/-0)
1 file modified
data/syncdaemon.conf (+1/-0)
To merge this branch: bzr merge lp:~dobey/ubuntuone-client/ignore-lock
Reviewer Review Type Date Requested Status
Facundo Batista (community) Approve
Mike McCracken (community) Approve
Review via email: mp+131097@code.launchpad.net

Commit message

Ignore *.lock files.

To post a comment you must log in.
Revision history for this message
Mike McCracken (mikemc) wrote :

looks good.

review: Approve
Revision history for this message
Facundo Batista (facundo) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'data/syncdaemon.conf'
2--- data/syncdaemon.conf 2012-09-18 12:40:29 +0000
3+++ data/syncdaemon.conf 2012-10-23 20:57:20 +0000
4@@ -84,6 +84,7 @@
5 \A.*\.swpx\Z
6 \A\..*\.tmp\Z
7 \A\.~lock\..*#\Z
8+ \A.*\.lock\Z
9 \A\.goutputstream-.*\Z
10 \A.*-Spotlight\Z
11 \A\.DS_Store\Z

Subscribers

People subscribed via source and target branches