Merge branch 'IT18150926_jayasekaraA.P.S.D' of...

Merge branch 'IT18150926_jayasekaraA.P.S.D' of http://gitlab.sliit.lk/2021-210/2021-210 into IT18150926_jayasekaraA.P.S.D

IT18150926.md

@@ -2,6 +2,7 @@
 
 "BEST BARK" - Dog care and owner consultation system
 
+<<<<<<< HEAD
 ### 2021-05-25
 
 learn python
@@ -14,3 +15,6 @@ learn Neuro-linguistic programing (NLP)
 
 create phython workplace
 
+=======
+# Ontology
+>>>>>>> 8ca60aa895dd280ae726d940f23d6f89dd1e6f12