hcq/MaxScale
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed conflict

Browse Source
This commit is contained in:
Mark Riddoch
2014-05-23 16:43:11 +01:00
parent 45d5d521b8
commit 78c5c407bd
1 changed files with 1 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
server/modules/routing/Makefile
View File

@ -86,10 +86,7 @@ depend:
install: $(MODULES) install: $(MODULES)
install -D $(MODULES) $(DEST)/MaxScale/modules install -D $(MODULES) $(DEST)/MaxScale/modules
(cd readwritesplit; make DEST=$(DEST) install) (cd readwritesplit; make DEST=$(DEST) install)
<<<<<<< HEAD
=======
(cd binlog; make DEST=$(DEST) install)
>>>>>>> blr
cleantests: cleantests:
$(MAKE) -C readwritesplit/test cleantests $(MAKE) -C readwritesplit/test cleantests