Code: Select all
C:\Users\Redpath\Documents\GitHub\MY_FGDATA>git pull
warning: Cannot merge binary files: AI/Aircraft/747/Textures/VirginAtlantic/744-
tex.png (HEAD vs. 0d2e476291e4b714f1533b5dea6e3b256460752e)
warning: Cannot merge binary files: AI/Aircraft/747/Textures/United/744-tex.png
(HEAD vs. 0d2e476291e4b714f1533b5dea6e3b256460752e)
warning: Cannot merge binary files: AI/Aircraft/747/Textures/Thai/744-tex.png (H
EAD vs. 0d2e476291e4b714f1533b5dea6e3b256460752e)
warning: Cannot merge binary files: AI/Aircraft/747/Textures/Qantas/744-tex.png
(HEAD vs. 0d2e476291e4b714f1533b5dea6e3b256460752e)
warning: Cannot merge binary files: AI/Aircraft/747/Textures/Malaysia/744-tex.pn
g (HEAD vs. 0d2e476291e4b714f1533b5dea6e3b256460752e)
warning: Cannot merge binary files: AI/Aircraft/747/Textures/Lufthansa/744-tex.p
ng (HEAD vs. 0d2e476291e4b714f1533b5dea6e3b256460752e)
warning: Cannot merge binary files: AI/Aircraft/747/Textures/Korean/744-tex.png
(HEAD vs. 0d2e476291e4b714f1533b5dea6e3b256460752e)
warning: Cannot merge binary files: AI/Aircraft/747/Textures/KLM/744-tex.png (HE
AD vs. 0d2e476291e4b714f1533b5dea6e3b256460752e)
warning: Cannot merge binary files: AI/Aircraft/747/Textures/Garuda/744-tex.png
(HEAD vs. 0d2e476291e4b714f1533b5dea6e3b256460752e)
warning: Cannot merge binary files: AI/Aircraft/747/Textures/EvaAir/744-tex.png
(HEAD vs. 0d2e476291e4b714f1533b5dea6e3b256460752e)
warning: Cannot merge binary files: AI/Aircraft/747/Textures/Delta/744-tex.png (
HEAD vs. 0d2e476291e4b714f1533b5dea6e3b256460752e)
warning: Cannot merge binary files: AI/Aircraft/747/Textures/Default/744-tex.png
(HEAD vs. 0d2e476291e4b714f1533b5dea6e3b256460752e)
warning: Cannot merge binary files: AI/Aircraft/747/Textures/ChinaAirlines/744-t
ex.png (HEAD vs. 0d2e476291e4b714f1533b5dea6e3b256460752e)
warning: Cannot merge binary files: AI/Aircraft/747/Textures/CathayPacific/744-t
ex.png (HEAD vs. 0d2e476291e4b714f1533b5dea6e3b256460752e)
warning: Cannot merge binary files: AI/Aircraft/747/Textures/BritishAirways/744-
tex.png (HEAD vs. 0d2e476291e4b714f1533b5dea6e3b256460752e)
warning: Cannot merge binary files: AI/Aircraft/747/Textures/AirChina/744-tex.pn
g (HEAD vs. 0d2e476291e4b714f1533b5dea6e3b256460752e)
Auto-merging AI/Aircraft/747/Textures/VirginAtlantic/744-tex.png
CONFLICT (add/add): Merge conflict in AI/Aircraft/747/Textures/VirginAtlantic/74
4-tex.png
Auto-merging AI/Aircraft/747/Textures/United/744-tex.png
CONFLICT (add/add): Merge conflict in AI/Aircraft/747/Textures/United/744-tex.pn
g
Auto-merging AI/Aircraft/747/Textures/Thai/744-tex.png
CONFLICT (add/add): Merge conflict in AI/Aircraft/747/Textures/Thai/744-tex.png
Auto-merging AI/Aircraft/747/Textures/Qantas/744-tex.png
CONFLICT (add/add): Merge conflict in AI/Aircraft/747/Textures/Qantas/744-tex.pn
g
Auto-merging AI/Aircraft/747/Textures/Malaysia/744-tex.png
CONFLICT (add/add): Merge conflict in AI/Aircraft/747/Textures/Malaysia/744-tex.
png
Auto-merging AI/Aircraft/747/Textures/Lufthansa/744-tex.png
CONFLICT (add/add): Merge conflict in AI/Aircraft/747/Textures/Lufthansa/744-tex
.png
Auto-merging AI/Aircraft/747/Textures/Korean/744-tex.png
CONFLICT (add/add): Merge conflict in AI/Aircraft/747/Textures/Korean/744-tex.pn
g
Auto-merging AI/Aircraft/747/Textures/KLM/744-tex.png
CONFLICT (add/add): Merge conflict in AI/Aircraft/747/Textures/KLM/744-tex.png
Auto-merging AI/Aircraft/747/Textures/Garuda/744-tex.png
CONFLICT (add/add): Merge conflict in AI/Aircraft/747/Textures/Garuda/744-tex.pn
g
Auto-merging AI/Aircraft/747/Textures/EvaAir/744-tex.png
CONFLICT (add/add): Merge conflict in AI/Aircraft/747/Textures/EvaAir/744-tex.pn
g
Auto-merging AI/Aircraft/747/Textures/Delta/744-tex.png
CONFLICT (add/add): Merge conflict in AI/Aircraft/747/Textures/Delta/744-tex.png
Auto-merging AI/Aircraft/747/Textures/Default/744-tex.png
CONFLICT (add/add): Merge conflict in AI/Aircraft/747/Textures/Default/744-tex.p
ng
Auto-merging AI/Aircraft/747/Textures/ChinaAirlines/744-tex.png
CONFLICT (add/add): Merge conflict in AI/Aircraft/747/Textures/ChinaAirlines/744
-tex.png
Auto-merging AI/Aircraft/747/Textures/CathayPacific/744-tex.png
CONFLICT (add/add): Merge conflict in AI/Aircraft/747/Textures/CathayPacific/744
-tex.png
Auto-merging AI/Aircraft/747/Textures/BritishAirways/744-tex.png
CONFLICT (add/add): Merge conflict in AI/Aircraft/747/Textures/BritishAirways/74
4-tex.png
Auto-merging AI/Aircraft/747/Textures/AirChina/744-tex.png
CONFLICT (add/add): Merge conflict in AI/Aircraft/747/Textures/AirChina/744-tex.
png