spryker-eco / akeneo-pim

src/SprykerEco/Shared/AkeneoPim/AkeneoPimConstants.php

Spacing +3 added lines, -3 removed lines

@@ -9,17 +9,17 @@
 
 interface AkeneoPimConstants
 {
-<<<<<<< Updated upstream
+<< << << < Updated upstream
     public const HOST = 'AKENEOPIM:HOST';
     public const USERNAME = 'AKENEOPIM:USERNAME';
     public const PASSWORD = 'AKENEOPIM:PASSWORD';
     public const CLIENT_ID = 'AKENEOPIM:CLIENT_ID';
     public const CLIENT_SECRET = 'AKENEOPIM:CLIENT_SECRET';
-=======
+=== === =
     public const HOST = 'akeneo.host';
     public const USERNAME = 'akeneo.username';
     public const PASSWORD = 'akeneo.password';
     public const CLIENT_ID = 'akeneo.client.id';
     public const CLIENT_SECRET = 'akeneo.client.secret';
->>>>>>> Stashed changes
+>> >> >> > Stashed changes
 }