Fixed garbage left from an incorrectly resolved conflict.

git-svn-id: http://openexile.googlecode.com/svn/trunk@65 4ebdad44-0ea0-11de-aab3-ff745001d230
2009-05-22 04:10:30 +00:00
parent d83db289fa
commit 032d6b86bf
1 changed files with 1 additions and 4 deletions
--- a/osx/boe.specials.cpp
+++ b/osx/boe.specials.cpp
@@ -329,12 +329,9 @@ bool check_special_terrain(location where_check,short mode,short which_pc,short
 				case DAMAGE_DEMON:
 					add_string_to_buf("  A dark wind blows through you!");
 					pic_type = 1; // TODO: Verify that this is correct
-<<<<<<< .mine
-					default:
 					break;
-=======
+				default:
 					break;
->>>>>>> .r62
 			}
 			r1 = get_ran(ter_flag2,dam_type,ter_flag1);
 			if (mode < 2)