Merge lp:~robru/ubuntu-push/restore-ignores into lp:ubuntu-push

Proposed by Robert Bruce Park
Status: Merged
Merged at revision: 163
Proposed branch: lp:~robru/ubuntu-push/restore-ignores
Merge into: lp:ubuntu-push
Diff against target: 13 lines (+4/-0)
2 files modified
docs/example-server/.bzrignore (+1/-0)
docs/example-server/.gitignore (+3/-0)
To merge this branch: bzr merge lp:~robru/ubuntu-push/restore-ignores
Reviewer Review Type Date Requested Status
Ubuntu Push Hackers Pending
Review via email: mp+293642@code.launchpad.net

Commit message

Restore .bzrignore and .gitignore.

Description of the change

These files were dropped recently to work around a train bug. I restore them now to test an experimental train fix.

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== added file 'docs/example-server/.bzrignore'
2--- docs/example-server/.bzrignore 1970-01-01 00:00:00 +0000
3+++ docs/example-server/.bzrignore 2016-05-03 15:41:34 +0000
4@@ -0,0 +1,1 @@
5+.git
6
7=== added file 'docs/example-server/.gitignore'
8--- docs/example-server/.gitignore 1970-01-01 00:00:00 +0000
9+++ docs/example-server/.gitignore 2016-05-03 15:41:34 +0000
10@@ -0,0 +1,3 @@
11+.bzr
12+.bzrignore
13+node_modules

Subscribers

People subscribed via source and target branches