Update 0812_SETTING.md

code-sum · web-flow · commit 4c86a6f6e22b · 2023-08-27T20:07:44.000+09:00
diff --git a/notes/0812_SETTING.md b/notes/0812_SETTING.md
@@ -22,13 +22,11 @@
   - [전자정부프레임워크 3.8 설치](https://www.egovframe.go.kr/home/sub.do?menuNo=41)
     - [설치 가이드 상세](https://dingbat.tistory.com/11)
     - [설치 이후 환경설정](https://webobj.tistory.com/29) 
-<<<<<<< HEAD
-=======
+
 - DBeaver
 - [Windows 에 DBeaver 설치](https://bskyvision.com/entry/%EC%9C%88%EB%8F%84%EC%9A%B0-PC%EC%97%90-DBeaver-%EC%84%A4%EC%B9%98%ED%95%98%EA%B8%B0)
 - [DBeaver 설치 및 PostgreSQL 연동](https://spiritup91.tistory.com/56)
 - [DBeaver 자동 대소문자 변환](https://jin2rang.tistory.com/entry/DBeaver-%EB%8C%80%EB%AC%B8%EC%9E%90-%EB%B3%80%ED%99%98-%EC%9E%90%EB%8F%99-%EB%8C%80%EB%AC%B8%EC%9E%90)
->>>>>>> a18c98b0d99e0c543e84baf40a370e1d0c266eca
 - PostgreSQL 13 + pgAdmin 4
   - PostgreSQL 설치 시, pgAdmin 함께 설치 됨
   - [Windows 에 PostgreSQL 설치](https://backendcode.tistory.com/225)
