Skip to content

Commit cd61f37

Browse files
authored
Merge pull request #10 from bimberlabinternal/fb_merge_develop
Merge develop to discvr-21.3
2 parents 0b8ee79 + 2a33baa commit cd61f37

File tree

1 file changed

+15
-15
lines changed

1 file changed

+15
-15
lines changed

laboratory/src/org/labkey/laboratory/view/workbookHeader.jsp

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
11
<%
2-
/*
3-
* Copyright (c) 2010-2012 LabKey Corporation
4-
*
5-
* Licensed under the Apache License, Version 2.0 (the "License");
6-
* you may not use this file except in compliance with the License.
7-
* You may obtain a copy of the License at
8-
*
9-
* http://www.apache.org/licenses/LICENSE-2.0
10-
*
11-
* Unless required by applicable law or agreed to in writing, software
12-
* distributed under the License is distributed on an "AS IS" BASIS,
13-
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14-
* See the License for the specific language governing permissions and
15-
* limitations under the License.
16-
*/
2+
/*
3+
* Copyright (c) 2010-2012 LabKey Corporation
4+
*
5+
* Licensed under the Apache License, Version 2.0 (the "License");
6+
* you may not use this file except in compliance with the License.
7+
* You may obtain a copy of the License at
8+
*
9+
* http://www.apache.org/licenses/LICENSE-2.0
10+
*
11+
* Unless required by applicable law or agreed to in writing, software
12+
* distributed under the License is distributed on an "AS IS" BASIS,
13+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14+
* See the License for the specific language governing permissions and
15+
* limitations under the License.
16+
*/
1717
%>
1818
<%@ page import="org.apache.commons.lang3.StringUtils" %>
1919
<%@ page import="org.labkey.api.view.HttpView" %>

0 commit comments

Comments
 (0)