merge

Gameserver/Amfphp/base/OpeCode.php

@@ -80,6 +80,7 @@ class OpeCode {
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 <<<<<<< HEAD
     // xueyuan
 =======
@@ -91,6 +92,8 @@ class OpeCode {
 =======
 >>>>>>> merge
 =======
+>>>>>>> merge
+=======
 =======
 >>>>>>> 学院
 >>>>>>> 学院
@@ -100,6 +103,9 @@ class OpeCode {
 =======
 //
 =======
+=======
+    // xueyuan
+>>>>>>> merge
 //
 // 
 >>>>>>> 学院