v0.2.2: corrected merging conflict (note to self: pull before you push from a different machine moron)

src/com/shatteredpixel/shatteredpixeldungeon/actors/blobs/ConfusionGas.java

@@ -33,6 +33,7 @@ public class ConfusionGas extends Blob {
         Char ch;
         for (int i=0; i < LENGTH; i++) {
             if (cur[i] > 0 && (ch = Actor.findChar( i )) != null) {
+                if (!ch.immunities().contains(this.getClass()))
                     Buff.prolong( ch, Vertigo.class, 2 );
             }
         }