[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Re: Bug#833421: jessie-pu: debian-edu-config/1.818+deb8u2]



On Tue, Aug 09, 2016 at 01:29:38PM +0000, Holger Levsen wrote:
> On Tue, Aug 09, 2016 at 12:29:59PM +0000, Holger Levsen wrote:
> > matrix:~/Projects/debian-edu/git/debian-edu-config$ git log 
> > --oneline jenkins-proposed..origin/schweer-foo 3810348 fix forgotten 
> > Makefile conflict issue.
 
[..]

> Feedback welcome.
 
For some reason the Makefile is wrong and should IMO be fixed like in 
3810348. You'll see it if you try to build the package from your branch.

Please compare 5dbb15f1 and 6c7ce5d0

One line (containing debian-edu.js) in the Makefile is not deleted. 
 
Wolfgang

Attachment: signature.asc
Description: Digital signature


Reply to: