[54/63] [abbrv] cloudstack-docs-admin git commit: Modifing licence terms

[pd...@apache.org]

http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/27b06378/source/locale/fr/LC_MESSAGES/virtual_machines/user-data.mo
----------------------------------------------------------------------
diff --git a/source/locale/fr/LC_MESSAGES/virtual_machines/user-data.mo b/source/locale/fr/LC_MESSAGES/virtual_machines/user-data.mo
deleted file mode 100644
index 3b2f8c1..0000000
Binary files a/source/locale/fr/LC_MESSAGES/virtual_machines/user-data.mo and /dev/null differ

http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/27b06378/source/locale/fr/LC_MESSAGES/virtual_machines/user-data.po
----------------------------------------------------------------------
diff --git a/source/locale/fr/LC_MESSAGES/virtual_machines/user-data.po b/source/locale/fr/LC_MESSAGES/virtual_machines/user-data.po
index b45849e..1fca365 100644
--- a/source/locale/fr/LC_MESSAGES/virtual_machines/user-data.po
+++ b/source/locale/fr/LC_MESSAGES/virtual_machines/user-data.po
@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 # Licensed to the Apache Software Foundation (ASF) under one
 # or more contributor license agreements.  See the NOTICE file
 # distributed with this work for additional information
@@ -15,13 +14,6 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
-=======
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) 2016, Apache Software Foundation
-# This file is distributed under the same license as the Apache CloudStack
-# Administration Documentation package.
-# FIRST AUTHOR <EM...@ADDRESS>, 2016.
->>>>>>> 90ae7fbf97b86217bc4905ad51a4b8437f12b84d
 #
 msgid ""
 msgstr ""