summaryrefslogtreecommitdiff
path: root/doc/forum/merging_upstream_changes_into_my_local_propellor_repo/comment_1_e522e00ee4d4b072d80faef748450a52._comment
diff options
context:
space:
mode:
authorJoey Hess2019-07-01 12:14:55 -0400
committerJoey Hess2019-07-01 12:14:55 -0400
commit9e372de7d5dda142a73aa8d14263136dfd6a9fe3 (patch)
tree0c9cf3a5eab205b55826e2505a0f0eedbdff653d /doc/forum/merging_upstream_changes_into_my_local_propellor_repo/comment_1_e522e00ee4d4b072d80faef748450a52._comment
parent394267002a8e63e52035919e4b35ee43cc940019 (diff)
parentccb2c08c1537766338755e4bf97a7d15c2162ef3 (diff)
Merge branch 'master' into joeyconfig
Diffstat (limited to 'doc/forum/merging_upstream_changes_into_my_local_propellor_repo/comment_1_e522e00ee4d4b072d80faef748450a52._comment')
-rw-r--r--doc/forum/merging_upstream_changes_into_my_local_propellor_repo/comment_1_e522e00ee4d4b072d80faef748450a52._comment10
1 files changed, 10 insertions, 0 deletions
diff --git a/doc/forum/merging_upstream_changes_into_my_local_propellor_repo/comment_1_e522e00ee4d4b072d80faef748450a52._comment b/doc/forum/merging_upstream_changes_into_my_local_propellor_repo/comment_1_e522e00ee4d4b072d80faef748450a52._comment
new file mode 100644
index 00000000..3c3623de
--- /dev/null
+++ b/doc/forum/merging_upstream_changes_into_my_local_propellor_repo/comment_1_e522e00ee4d4b072d80faef748450a52._comment
@@ -0,0 +1,10 @@
+[[!comment format=mdwn
+ username="spwhitton"
+ avatar="http://cdn.libravatar.org/avatar/9c3f08f80e67733fd506c353239569eb"
+ subject="comment 1"
+ date="2019-06-02T00:34:48Z"
+ content="""
+The `upstream/master` thing is probably propellor's code looking in `/usr/src/propellor` for a new upstream version.
+
+Do you perhaps no longer have the Debian package of propellor installed?
+"""]]