diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/CIController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/CIController.js
index a4be676..f22314b 100644
--- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/CIController.js
+++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/CIController.js
@@ -501,11 +501,7 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
$scope.openView = function ($event) {
-<<<<<<< HEAD
-
-=======
->>>>>>> ff2e54b01b493c73a29a72bdc4e069475d6e53c4
$rootScope.MenuModuleName = "CI";
$rootScope.disableAnnotationTB = false;
$rootScope.CIAnotationIdentifyModeOff = true;
@@ -527,10 +523,6 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
}
-<<<<<<< HEAD
-
-=======
->>>>>>> ff2e54b01b493c73a29a72bdc4e069475d6e53c4
localStorage.setItem("currentViewTitleFromJson", $rootScope.ViewTitle);
localStorage.setItem("currentBodyViewId", $event.currentTarget.id);
@@ -546,10 +538,6 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
$scope.openBodyView = function () {
-<<<<<<< HEAD
-
-=======
->>>>>>> ff2e54b01b493c73a29a72bdc4e069475d6e53c4
if ($rootScope.refreshcheck == null) {
$location.path('/');
}
@@ -558,38 +546,6 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
$('#spinner').css('visibility', 'visible');
$scope.voId = $rootScope.getLocalStorageValue("currentBodyViewId");
-<<<<<<< HEAD
- // alert($scope.voId);
-
-
- //once you get id in scope push detail in jspanel content
-
- var openViews;
- if ($rootScope.openViews.length > 0) {
- openViews = new jinqJs()
- .from($rootScope.openViews)
- .where("BodyViewId==" + $scope.voId)
- .select();
- }
- var counter = 1;
- var tittle = $rootScope.getLocalStorageValue("currentViewTitleFromJson");
-
- if (openViews != null && openViews.length > 0) {
- angular.forEach(openViews, function (value, key) {
-
- if (value.body - views == tittle) {
- tittle = $rootScope.getLocalStorageValue("currentViewTitleFromJson") + counter++;
- $rootScope.currentActiveViewTitle = tittle;
- localStorage.setItem("currentViewTitle", tittle);
- }
-
- });
- }
- else {
- localStorage.setItem("currentViewTitle", tittle);
-
- }
-=======
//once you get id in scope push detail in jspanel content
@@ -632,7 +588,6 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
// localStorage.setItem("currentViewTitle", tittle);
//}
->>>>>>> ff2e54b01b493c73a29a72bdc4e069475d6e53c4
//alert($rootScope.getLocalStorageValue("currentViewTitle"));
@@ -804,8 +759,4 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
}]
-);
-
-
-
-
+);
\ No newline at end of file
diff --git a/400-SOURCECODE/AIAHTML5.Web/app/views/Link/Link-view.html b/400-SOURCECODE/AIAHTML5.Web/app/views/Link/Link-view.html
index 0bf33d3..eee4c04 100644
--- a/400-SOURCECODE/AIAHTML5.Web/app/views/Link/Link-view.html
+++ b/400-SOURCECODE/AIAHTML5.Web/app/views/Link/Link-view.html
@@ -4,12 +4,9 @@
-<<<<<<< HEAD
-=======
->>>>>>> ff2e54b01b493c73a29a72bdc4e069475d6e53c4
@@ -35,6 +32,4 @@
}, false);
});
-
-
-
+
\ No newline at end of file
diff --git a/400-SOURCECODE/Admin/dist/index.html b/400-SOURCECODE/Admin/dist/index.html
index 23f26cb..b3cdf76 100644
--- a/400-SOURCECODE/Admin/dist/index.html
+++ b/400-SOURCECODE/Admin/dist/index.html
@@ -1,7 +1,7 @@
-A.D.A.M. Interactive Anatomy