This has conflicts as vincent warned about.
Whats up with this:
38 +<<<<<<< TREE 39 # Copyright (C) 2005-2010 Canonical Ltd 40 +======= 41 +# Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010 Canonical Ltd 42 +>>>>>>> MERGE-SOURCE 43 #
The 2005-2010 form is a lot pithier; I don't recall a policy decision to avoid it?
Could you please comment on vincents notes about using overrideAttr too. Thanks.
« Back to merge proposal
This has conflicts as vincent warned about.
Whats up with this:
38 +<<<<<<< TREE
39 # Copyright (C) 2005-2010 Canonical Ltd
40 +=======
41 +# Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010 Canonical Ltd
42 +>>>>>>> MERGE-SOURCE
43 #
The 2005-2010 form is a lot pithier; I don't recall a policy decision to avoid it?
Could you please comment on vincents notes about using overrideAttr too. Thanks.