The merging will continue until morale improves

Author: eggrobin

unicodetools/data/ucd/dev/ArabicShaping.txt

@@ -851,7 +851,8 @@ A873; PHAGS-PA CANDRABINDU; U; No_Joining_Group
 10EC2; DAL WITH VERTICAL 2 DOTS BELOW; R; DAL
 10EC3; TAH WITH VERTICAL 2 DOTS BELOW; D; TAH
 10EC4; KAF WITH VERTICAL 2 DOTS BELOW; D; KAF
-<<<<<<< HEAD
+10EC6; THIN NOON; D; THIN NOON
+10EC7; DOTLESS YEH WITH 4 DOTS BELOW; D; YEH
 10ED9; CROWN BEH; L; CROWN BEH
 10EDA; DOTLESS CROWN BEH WITH 3 DOTS BELOW; L; CROWN BEH
 10EDB; DOTLESS CROWN BEH WITH 2 DOTS ABOVE; L; CROWN BEH
@@ -874,10 +875,6 @@ A873; PHAGS-PA CANDRABINDU; U; No_Joining_Group
 10EEC; DOTLESS CROWN BEH WITH DOT ABOVE; L; CROWN BEH
 10EED; CROWN HEH; L; CROWN HEH
 10EEE; DOTLESS CROWN BEH WITH 2 DOTS BELOW; L; CROWN BEH
-=======
-10EC6; THIN NOON; D; THIN NOON
-10EC7; DOTLESS YEH WITH 4 DOTS BELOW; D; YEH
->>>>>>> la-vache/main
 
 # Sogdian Characters