From 8731807b710c64874f4693b511e1f31074dd93eb Mon Sep 17 00:00:00 2001 From: pichoro Date: Fri, 10 Jul 2009 20:34:37 +0000 Subject: [PATCH] Fixing a mistake from my incorrect merging of a file. git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@1403 0fc631ac-6414-0410-93d0-97cfa31319b6 --- data/magic.mse-game/keywords | 4 ---- 1 file changed, 4 deletions(-) diff --git a/data/magic.mse-game/keywords b/data/magic.mse-game/keywords index c25a6dac..46a89442 100644 --- a/data/magic.mse-game/keywords +++ b/data/magic.mse-game/keywords @@ -151,11 +151,7 @@ keyword: keyword: Banding match: Banding mode: old -<<<<<<< .mine reminder: Any creatures with banding, and up to one without, can attack in a band. Bands are blocked as a group. If any creatures with banding you control are blocking or being blocked by a creature, you divide that creature's combat damage, not its controller, among any of the creatures it's being blocked by or is blocking. -======= - reminder: Any creatures with banding, and up to one without, can attack in a band. Bands are blocked as a group. If any creatures with banding you control are blocking or being blocked by a creature, you divide that creature's combat damage, not its controller, among any of the creatures it's being blocked by or is blocking ->>>>>>> .r1399 keyword: keyword: Landwalk match: prefixwalk