Guest User

Untitled

a guest
Oct 15th, 2018
67
0
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 7.71 KB | None | 0 0
  1. <<<<<<< HEAD
  2. 7232C00F216BB9E900C754F7 /* Cámara_m.png in Resources */,
  3. 7232B474216BAFDD00C754F7 /* autodiagnostico_00040.png in Resources */,
  4. 7232C057216BB9E900C754F7 /* Altavoces_m.png in Resources */,
  5. 7232B0B2216BACF900C754F7 /* b_tv@3x.png in Resources */,
  6. 7232C351216BC15200C754F7 /* mobile_error_dotss@3x.png in Resources */,
  7. 7232B435216BAFDD00C754F7 /* autodiagnostico_00057.png in Resources */,
  8. 7232B951216BB69700C754F7 /* RouterV2.png in Resources */,
  9. 7232BAB0216BB69800C754F7 /* Router+Baseport@2x.png in Resources */,
  10. 7232B9B4216BB69800C754F7 /* ampli2only@3x.png in Resources */,
  11. 7232B63F216BAFDE00C754F7 /* diag_btn_sms2@2x.png in Resources */,
  12. 7232BFD9216BB9E900C754F7 /* Auriculares_m.png in Resources */,
  13. 7232B381216BAFDD00C754F7 /* autodiagnostico_00023.png in Resources */,
  14. 7232B4B3216BAFDD00C754F7 /* autodiagnostico_00070.png in Resources */,
  15. 7232C0C3216BBB4F00C754F7 /* fab-qr.png in Resources */,
  16. 7232B46B216BAFDD00C754F7 /* autodiagnostico_00054.png in Resources */,
  17. 7232BE56216BB9E800C754F7 /* GOtro.png in Resources */,
  18. 7232B022216BACF900C754F7 /* b_smarthome@1x.png in Resources */,
  19. 7232C3BD216BC15200C754F7 /* pair_logo@3x.png in Resources */,
  20. 7232AF49216BA9B300C754F7 /* Optimizacion-blue.png in Resources */,
  21. 7232C2F7216BC15200C754F7 /* ampli_publi@2x.png in Resources */,
  22. 7232C2D3216BC15200C754F7 /* graphblue.png in Resources */,
  23. 7232BD6B216BB97E00C754F7 /* ampli_new@3x.png in Resources */,
  24. 7232B687216BAFDE00C754F7 /* diag_btn_repeat2@3x.png in Resources */,
  25. 7232B528216BAFDD00C754F7 /* autodiagnostico_00060.png in Resources */,
  26. 7232B990216BB69700C754F7 /* router_sombra@2x.png in Resources */,
  27. 7232BA20216BB69800C754F7 /* hgu+port2b.png in Resources */,
  28. 7232BE3B216BB9E800C754F7 /* GLavadora.png in Resources */,
  29. 7232B5F7216BAFDE00C754F7 /* autodiagnostico_00016.png in Resources */,
  30. 7232BAB9216BB69800C754F7 /* router_sombra@1x.png in Resources */,
  31. 7232C09F216BBB4F00C754F7 /* button-bg-blue.png in Resources */,
  32. 7232BEE6216BB9E800C754F7 /* Apple tv.png in Resources */,
  33. 7232B5DC216BAFDD00C754F7 /* autodiagnostico_00029.png in Resources */,
  34. 7232BA05216BB69800C754F7 /* Router@2x.png in Resources */,
  35. 7232B9D8216BB69800C754F7 /* nohgu+port2b@3x.png in Resources */,
  36. 7232B9CF216BB69800C754F7 /* Routernohgu+BaseportV2@2x.png in Resources */,
  37. 7232C363216BC15200C754F7 /* ampli_onboarding@2x.png in Resources */,
  38. 7232BD32216BB95100C754F7 /* mr_ampliV3@3x.png in Resources */,
  39. 7232B06A216BACF900C754F7 /* b_notConnected.png in Resources */,
  40. 7232AF25216BA9B300C754F7 /* Printer-white.png in Resources */,
  41. 7232B9FC216BB69800C754F7 /* routernobrand.png in Resources */,
  42. 7232BB45216BB7C500C754F7 /* noyellow5.png in Resources */,
  43. 7232AFC7216BA9B300C754F7 /* House-gray.png in Resources */,
  44. 7232BD17216BB95100C754F7 /* reload_arrow2V2@1x.png in Resources */,
  45. 7232BA32216BB69800C754F7 /* RouterNoHGU@2x.png in Resources */,
  46. 7232AFBE216BA9B300C754F7 /* Loading.png in Resources */,
  47. 7232C36C216BC15200C754F7 /* pair_logo@1x.png in Resources */,
  48. 7232B2E8216BAFDD00C754F7 /* autodiagnostico_00032.png in Resources */,
  49. 7232AEDD216BA9B300C754F7 /* Settings-white.png in Resources */,
  50. 7232B058216BACF900C754F7 /* b_security@1x.png in Resources */,
  51. =======
  52. 6D281965205036FB00E66193 /* autodiagnostico_00001.png in Resources */,
  53. 6D281966205036FB00E66193 /* ampli_publi@3x.png in Resources */,
  54. 6D281967205036FB00E66193 /* b_computer@3x.png in Resources */,
  55. 6D281968205036FB00E66193 /* autodiagnostico_00075.png in Resources */,
  56. 6D281969205036FB00E66193 /* diag_tv@2x.png in Resources */,
  57. 6D28196A205036FB00E66193 /* reload_arrowV2@1x.png in Resources */,
  58. 6D28196B205036FB00E66193 /* password_label_ampli_em@2x.png in Resources */,
  59. 6D4043652164DDA60076047B /* StoryboardTests.storyboard in Resources */,
  60. 6D28196C205036FB00E66193 /* GTablet.png in Resources */,
  61. 6D28196D205036FB00E66193 /* Bubble-9.png in Resources */,
  62. 6D28196E205036FB00E66193 /* autodiagnostico_00009.png in Resources */,
  63. 6D28196F205036FB00E66193 /* Router@2x.png in Resources */,
  64. 6D281970205036FB00E66193 /* password_labelV2@1x.png in Resources */,
  65. 6D281971205036FB00E66193 /* password_label@1x.png in Resources */,
  66. 6D281972205036FB00E66193 /* router_sombra@3x.png in Resources */,
  67. 6D281973205036FB00E66193 /* Cámara_m.png in Resources */,
  68. 6D281974205036FB00E66193 /* reload_arrow@1x.png in Resources */,
  69. 6D281975205036FB00E66193 /* mr_ampli@3x.png in Resources */,
  70. 6D281976205036FB00E66193 /* Routernohgu+Baseport@3x.png in Resources */,
  71. 6D281979205036FB00E66193 /* nohgu+port2bV2@2x.png in Resources */,
  72. 6D28197A205036FB00E66193 /* RouterV3@2x.png in Resources */,
  73. 6D28197B205036FB00E66193 /* fab_speed@2x.png in Resources */,
  74. 6D28197C205036FB00E66193 /* Arrow-right-blue.png in Resources */,
  75. 6D28197D205036FB00E66193 /* b_mobile@3x.png in Resources */,
  76. 6D28197E205036FB00E66193 /* mobile_error_dotss@1x.png in Resources */,
  77. 6D28197F205036FB00E66193 /* printer-gray.png in Resources */,
  78. 6D281980205036FB00E66193 /* Mobile-gray.png in Resources */,
  79. 6D281981205036FB00E66193 /* Router-on-white.png in Resources */,
  80. 6D281982205036FB00E66193 /* diag_internet@2x.png in Resources */,
  81. 6D281983205036FB00E66193 /* autodiagnostico_00012.png in Resources */,
  82. 6D281984205036FB00E66193 /* GOrdenador.png in Resources */,
  83. 6D281985205036FB00E66193 /* diag_error@2x.png in Resources */,
  84. 6D281986205036FB00E66193 /* mobile@3x.png in Resources */,
  85. 6D281987205036FB00E66193 /* tv_tempoal.png in Resources */,
  86. 6D281988205036FB00E66193 /* autodiagnostico_00086.png in Resources */,
  87. 6D403FF2216222BE0076047B /* b_connected@3X.png in Resources */,
  88. 6D281989205036FB00E66193 /* Invitado-blue.png in Resources */,
  89. 6D28198A205036FB00E66193 /* GPersiana.png in Resources */,
  90. 6D28198C205036FB00E66193 /* nohgu+port2b@2x.png in Resources */,
  91. 6D28198D205036FB00E66193 /* password_labelV3@2x.png in Resources */,
  92. 6D28198E205036FB00E66193 /* autodiagnostico_00087.png in Resources */,
  93. 6D28198F205036FB00E66193 /* diag_call@1x.png in Resources */,
  94. 6D281990205036FB00E66193 /* b_security@2x.png in Resources */,
  95. 6D403FFA216222BE0076047B /* b_notConnected@3X.png in Resources */,
  96. 6D281991205036FB00E66193 /* Alarma.png in Resources */,
  97. 6D281992205036FB00E66193 /* balloon-purple.png in Resources */,
  98. 6D281993205036FB00E66193 /* diag_btn_repeat2@1x.png in Resources */,
  99. 6D281994205036FB00E66193 /* autodiagnostico_00039.png in Resources */,
  100. 6D281995205036FB00E66193 /* TV.png in Resources */,
  101. 6D281996205036FB00E66193 /* whitecross.png in Resources */,
  102. 6D281997205036FB00E66193 /* GSmarthpone.png in Resources */,
  103. 6D281998205036FB00E66193 /* mr_cable@1x.png in Resources */,
  104. 6D28199A205036FB00E66193 /* Altavoces.png in Resources */,
  105. 6D28199B205036FB00E66193 /* shape-arrow.png in Resources */,
  106. 6D28199D205036FB00E66193 /* diag_btn_resetv2@2x.png in Resources */,
  107. 6D28199E205036FB00E66193 /* mr_router@1x.png in Resources */,
  108. 6D2819A0205036FB00E66193 /* autodiagnostico_00027.png in Resources */,
  109. 6D2819A1205036FB00E66193 /* balloon-yellow.png in Resources */,
  110. 6D2819A2205036FB00E66193 /* autodiagnostico_00084.png in Resources */,
  111. 6D2819A3205036FB00E66193 /* GSmartwatch.png in Resources */,
  112. 6D2819A4205036FB00E66193 /* Bubble-7.png in Resources */,
  113. 6D2819A5205036FB00E66193 /* hgu+port2b.png in Resources */,
  114. 6D2819A6205036FB00E66193 /* autodiagnostico_00082.png in Resources */,
  115. 6D2819A7205036FB00E66193 /* Chromecast.png in Resources */,
  116. >>>>>>> feature/profiles_BBDD
Add Comment
Please, Sign In to add comment