Fixes

src/addon/addon_manager.cpp

@@ -301,7 +301,7 @@ AddonManager::check_online()
 TransferStatusListPtr
 AddonManager::request_install_addon(const AddonId& addon_id)
 {
-  // Remove addon if it already exists.
+  // Remove add-on if it already exists.
   auto it = m_installed_addons.find(addon_id);
   if (it != m_installed_addons.end())
   {

src/trigger/door.cpp

@@ -95,13 +95,8 @@ Door::update(float )
     case CLOSED:
       break;
     case OPENING:
-<<<<<<< HEAD
-      // if door has finished opening, start timer and keep door open
-      if (m_sprite->animation_done()) {
-=======
       // If door has finished opening, start timer and keep door open.
-      if (sprite->animation_done()) {
->>>>>>> 52b3efd73 (Fix comment style and consistency [Part 2])
+      if (m_sprite->animation_done()) {
         state = OPEN;
         set_action("open");
         stay_open_timer.start(1.0);
@@ -115,13 +110,8 @@ Door::update(float )
       }
       break;
     case CLOSING:
-<<<<<<< HEAD
-      // if door has finished closing, keep it shut
-      if (m_sprite->animation_done()) {
-=======
       // If door has finished closing, keep it shut.
-      if (sprite->animation_done()) {
->>>>>>> 52b3efd73 (Fix comment style and consistency [Part 2])
+      if (m_sprite->animation_done()) {
         state = CLOSED;
         set_action("closed");
       }

src/video/gl/gl_video_system.cpp

@@ -181,7 +181,7 @@ GLVideoSystem::create_gl_context()
   assert_gl();
 
   if (g_config->try_vsync) {
-    // We want v-sync for smooth scrolling.
+    // We want VSync for smooth scrolling.
     if (SDL_GL_SetSwapInterval(-1) != 0)
     {
       log_info << "no support for late swap tearing vsync: " << SDL_GetError() << std::endl;