Commit e0bc763c authored by jayd1860's avatar jayd1860
Browse files

-- Fix wrong path to DataTree to exclude from merges 

-- Add .gitattributes in list of files to exclude fropm merges
parent 345daa59

.gitattributes

0 → 100644
+4 −0
Original line number Diff line number Diff line 
DataTree merge=ours 

Utils/Shared merge=ours

.gitmodules merge=ours

.gitattributes merge=ours

CRA Git | Maintained and supported by SUSTech CRA and CCSE