new skin

This commit is contained in:
Van
2017-02-18 16:01:06 +08:00
parent d7bfb0e9fc
commit 30408b6064
64 changed files with 2850 additions and 306 deletions

View File

@@ -1,23 +1,5 @@
/**
* Copyright (c) 2010-2017, b3log.org & hacpai.com
<<<<<<< HEAD
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
/**
* Copyright (c) 2010-2016, b3log.org & hacpai.com
=======
>>>>>>> origin/master
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.