Fix issue with constellation art that left merge conflict annotations behind

data/assets/scene/milkyway/constellations/constellation_art.asset

@@ -1,7 +1,4 @@
-<<<<<<< HEAD
 local constellationsCSV = asset.localResource('constellation_data.csv')
-=======
->>>>>>> master
 local transforms = asset.require("scene/solarsystem/sun/transforms")
 
 local images = asset.syncedResource({
@@ -84,11 +81,8 @@ end
 local nodes = {}
 
 asset.onInitialize(function ()
-<<<<<<< HEAD
-=======
   local constellationsCSV = images .. "/constellation_data.csv"
 
->>>>>>> master
   nodes = createConstellations('Constellation Art', constellationsCSV)
   for _, n in ipairs(nodes) do
     openspace.addSceneGraphNode(n);