From 9042a4e0f21e5cacee9c2f3bfcb3dc5162cfc431 Mon Sep 17 00:00:00 2001
From: Marianne Gagnon <auria.mg@gmail.com>
Date: Tue, 18 Mar 2014 19:26:36 -0400
Subject: [PATCH] Fix bogus merge, sorry

---
 src/achievements/achievement_info.hpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/achievements/achievement_info.hpp b/src/achievements/achievement_info.hpp
index 32e111ee9..4443a7c5e 100644
--- a/src/achievements/achievement_info.hpp
+++ b/src/achievements/achievement_info.hpp
@@ -48,7 +48,7 @@ public:
            ACHIEVE_ARCH_ENEMY  = 3,
            ACHIEVE_MARATHONER  = 4,
            ACHIEVE_SKIDDING    = 5,
-           ACHIEVE_GOLD_DRIVER = 6
+           ACHIEVE_GOLD_DRIVER = 6,
            ACHIEVE_POWERUP_LOVER = 7
     };
     /** Achievement check type: