remove merghe c

Author: Droid00000

lib/discordrb/data.rb

@@ -43,10 +43,7 @@
 require 'discordrb/data/avatar_decoration'
 require 'discordrb/data/collectibles'
 require 'discordrb/data/primary_server'
-<<<<<<< HEAD
 require 'discordrb/data/server_preview'
 require 'discordrb/data/call'
-=======
 require 'discordrb/data/team'
 require 'discordrb/data/install_params'
->>>>>>> f3988e354 (feat: missing application attributes)