diff options
| author | Joey Hess <joeyh@joeyh.name> | 2016-05-05 10:38:01 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2016-05-05 10:38:01 -0400 |
| commit | 6b54a846bbe82c4c413a2d5d9031895f38377754 (patch) | |
| tree | b7385c0526ccd95b6f80bd0004496da5e529bf39 | |
| parent | 1e12a3a8c4fd0a5b027ff7923bb014b7836f8fd9 (diff) | |
| parent | 6f3a19973ef03c80d634d2cb64d2a72af4fb3548 (diff) | |
Merge branch 'master' into joeyconfig
| l--------- | config.hs | 2 | ||||
| -rw-r--r-- | doc/todo/propellor_--init_option_B_failure/comment_1_f2229a499f4be0e64d030e2ecc0927f6._comment | 2 | ||||
| -rw-r--r-- | privdata/relocate | 1 |
3 files changed, 2 insertions, 3 deletions
@@ -1 +1 @@ -joeyconfig.hs
\ No newline at end of file +config-simple.hs
\ No newline at end of file diff --git a/doc/todo/propellor_--init_option_B_failure/comment_1_f2229a499f4be0e64d030e2ecc0927f6._comment b/doc/todo/propellor_--init_option_B_failure/comment_1_f2229a499f4be0e64d030e2ecc0927f6._comment index 2b569afb..e9edb435 100644 --- a/doc/todo/propellor_--init_option_B_failure/comment_1_f2229a499f4be0e64d030e2ecc0927f6._comment +++ b/doc/todo/propellor_--init_option_B_failure/comment_1_f2229a499f4be0e64d030e2ecc0927f6._comment @@ -11,6 +11,6 @@ where it's cloned from the git archive in the package. Any other installation method than the debian package that I know of installs both the propellor command and the propellor haskell library. -(Note that propellor 3.0.1 fixes an unrelated bug that prevented option B +(Note that propellor 3.0.1^W3.0.3 fixes an unrelated bug that prevented option B from working.) """]] diff --git a/privdata/relocate b/privdata/relocate deleted file mode 100644 index 271692d8..00000000 --- a/privdata/relocate +++ /dev/null @@ -1 +0,0 @@ -.joeyconfig |