Resilved merge conflicts

sanchita-dixit · Apr 16, 2016 · 0d07b1c · 0d07b1c
2 parents 9a249d1 + 0042521
commit 0d07b1c
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 5 deletions.
diff --git a/src/hiring/content-writer.org b/src/hiring/content-writer.org
@@ -1,6 +1,7 @@
 #+title:  Technical Content Writer
-#+SETUPFILE: ../org-templates/level-1.org*
+#+SETUPFILE: ../org-templates/level-1.org
 
+* Job Description
 ** Number of positions : 01
 Virtual Labs Engineering and Architecture Division (VLEAD) is looking
 for a competent technical content writer to work at Virtual Labs. You

diff --git a/src/hiring/frontend-web-developer.org b/src/hiring/frontend-web-developer.org
@@ -1,6 +1,7 @@
 #+title: Frontend Web Developer
-#+SETUPFILE: ../org-templates/level-1.org*
+#+SETUPFILE: ../org-templates/level-1.org
 
+* Job Description
 ** Number of positions : 01
 Virtual Labs Engineering and Architecture Division (VLEAD) is looking
 for competent and experienced frontend web developers to work in the

diff --git a/src/hiring/systems-engineer.org b/src/hiring/systems-engineer.org
@@ -1,6 +1,7 @@
 #+title: Systems Engineer
-#+SETUPFILE: ../org-templates/level-1.org*
+#+SETUPFILE: ../org-templates/level-1.org
 
+* Job Description
 ** Number of positions : 01
 Virtual Labs Engineering and Architecture Division (VLEAD) is looking
 for competent and experienced systems engineers to work in the core

diff --git a/src/hiring/technical-project-manager.org b/src/hiring/technical-project-manager.org
@@ -1,6 +1,7 @@
 #+title: Technical Project Manager
-#+SETUPFILE: ../org-templates/level-1.org*
+#+SETUPFILE: ../org-templates/level-1.org
 
+* Job Description
 ** Number of positions : 01
 Virtual Labs Engineering and Architecture Division (VLEAD) is looking
 for a competent and experienced technical project manager to work in

diff --git a/src/hiring/technical-team-leader.org b/src/hiring/technical-team-leader.org
@@ -1,6 +1,7 @@
 #+title: Technical Team Lead 
-#+SETUPFILE: ../org-templates/level-1.org*
+#+SETUPFILE: ../org-templates/level-1.org
 
+* Job Description
 ** Number of positions : 01
 Virtual Labs Engineering and Architecture Division (VLEAD) is looking
 for a competent and experienced technical team lead to work in the