From 2220f3f3e9031bb6e6791c59b799916c6b75b193 Mon Sep 17 00:00:00 2001
From: lee-zt <2960166273@qq.com>
Date: Thu, 29 May 2025 11:40:02 +0800
Subject: [PATCH] 1

---
 .../luojia-island/vue-frontend/src/stores/postlist.js         | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/珞珈岛-项目相关文件/luojia-island/vue-frontend/src/stores/postlist.js b/珞珈岛-项目相关文件/luojia-island/vue-frontend/src/stores/postlist.js
index e015120..a7a4958 100644
--- a/珞珈岛-项目相关文件/luojia-island/vue-frontend/src/stores/postlist.js
+++ b/珞珈岛-项目相关文件/luojia-island/vue-frontend/src/stores/postlist.js
@@ -1,9 +1,5 @@
-<<<<<<< HEAD
 import {defineStore} from 'pinia';
 //import axios from 'axios'; 
-=======
-import {defineStore} from 'pinia'; 
->>>>>>> 61cc9965ff7b00a12b6a049686385afb06ef8be0
 import request from '@/utils/request';
 import { ElMessage } from 'element-plus';