Merge branch 'master' of https://github.com/KunTengRom/xfrp_server

Conflicts: .gitignore LICENSE
liudf0716 · Jun 19, 2017 · 4dc2235 · 4dc2235
2 parents 0f120e3 + 055fcad
commit 4dc2235
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/LICENSE b/LICENSE
@@ -199,4 +199,7 @@
    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.
+<<<<<<< HEAD
 
+=======
+>>>>>>> 055fcadc04a223108c05c3cc0b43dab560f422c5