From 9a24e9adbc0477719fed960b879f8e5dcf870aba Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Fri, 22 Dec 2017 16:14:37 +0800
Subject: [PATCH] Merge branch 'master' of ssh://blit.7drlb.com:29418/screen_api_v2

---
 src/main/java/com/moral/controller/DeviceVersionController.java |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)

diff --git a/src/main/java/com/moral/controller/DeviceVersionController.java b/src/main/java/com/moral/controller/DeviceVersionController.java
index d853c1c..14bf960 100644
--- a/src/main/java/com/moral/controller/DeviceVersionController.java
+++ b/src/main/java/com/moral/controller/DeviceVersionController.java
@@ -9,5 +9,4 @@
 @RequestMapping("device-version")
 @CrossOrigin(origins = "*", maxAge = 3600)
 public class DeviceVersionController {
-
 }

--
Gitblit v1.8.0