-
…TML5 into AnnotationToolBar_latest # Conflicts: # 400-SOURCECODE/AIAHTML5.Web/Web.config # 400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js # 400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js # 400-SOURCECODE/AIAHTML5.Web/app/views/da/da-view.html # 400-SOURCECODE/AIAHTML5.Web/index.html
-
# Conflicts: # 400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js # 400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js # 400-SOURCECODE/AIAHTML5.Web/app/views/da/da-view.html # 400-SOURCECODE/AIAHTML5.Web/index.html