Merge branch 'skinnable-master'

[nucleus-jp/nucleus-next.git] / nucleus / plugins / NP_SkinFiles.php

diff --git a/nucleus/plugins/NP_SkinFiles.php b/nucleus/plugins/NP_SkinFiles.php
index 8f8005a..ad88a68 100644 (file)
--- a/nucleus/plugins/NP_SkinFiles.php
+++ b/nucleus/plugins/NP_SkinFiles.php
@@ -7,7 +7,11 @@ class NP_SkinFiles extends NucleusPlugin {
        *
        * Copyright 2005-2007 by Jeff MacMichael and Niels Leenheer
        *
+<<<<<<< HEAD
+       * @version $Id: NP_SkinFiles.php 1678 2012-02-26 07:31:36Z sakamocchi $
+=======
        * @version $Id: NP_SkinFiles.php 1749 2012-04-13 14:06:34Z sakamocchi $
+>>>>>>> skinnable-master
        * @version $NucleusJP: NP_SkinFiles.php,v 1.3 2006/07/17 20:03:45 kimitake Exp $
        *
        * ==========================================================================================